X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/49116ac071969bee7f129bf7ce725c7a5b0b0fc5..a03b3ce13b064a5f775525d8208e747b87a169cf:/lisp/sun-curs.el

diff --git a/lisp/sun-curs.el b/lisp/sun-curs.el
index ec5ffc8442..b95ecde7e1 100644
--- a/lisp/sun-curs.el
+++ b/lisp/sun-curs.el
@@ -1,11 +1,16 @@
-;; Cursor definitions for Sun windows
+;;; sun-curs.el --- cursor definitions for Sun windows
+
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
+;; Author: Jeff Peck <peck@sun.com>
+;; Maintainer: none
+;; Keywords: hardware
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -14,8 +19,11 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
 
 ;;;
 ;;; Added some more cursors and moved the hot spots
@@ -23,7 +31,10 @@
 ;;;
 ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <peck@sun.com>
 
-(defvar sc::cursors nil "List of known cursors")
+(require 'cl)
+
+(eval-and-compile
+  (defvar sc::cursors nil "List of known cursors"))
 
 (defmacro defcursor (name x y string)
   (if (not (memq name sc::cursors)) 
@@ -91,7 +102,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
 (defun sc::pic-ins-at-mouse (char)
   "Picture insert char at mouse location"
   (mouse-move-point *mouse-window* (min 15 *mouse-x*) (min 15 *mouse-y*))
-  (move-to-column-force (1+ (min 15 (current-column))))
+  (move-to-column (1+ (min 15 (current-column))) t)
   (delete-char -1)
   (insert char)
   (sc::goto-hotspot))
@@ -110,7 +121,7 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
   ("Set Cursor" sc:set-cursor
 		(sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*)) 
   ("Reset Cursor" sc:set-cursor nil)
-  ("Help". sc::edit-icon-help-menu)
+  ("Help" sc::edit-icon-help-menu)
   ("Quit" sc::quit-edit)
   )
 
@@ -205,3 +216,4 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
 
 (provide 'sm-cursors)
 
+;;; sun-curs.el ends here