(vc-diff-switches): New user option.

[gnu-emacs] / lisp / sun-curs.el

diff --git a/lisp/sun-curs.el b/lisp/sun-curs.el
index 5e8a6fa167aceef56e075f01961038de946a806c..934114232cdfb2e08f151e300c7dfbfa50e324b5 100644 (file)
--- a/lisp/sun-curs.el
+++ b/lisp/sun-curs.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1987 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
+;; Maintainer: none
 ;; Keywords: hardware
 
 ;; This file is part of GNU Emacs.
@@ -18,8 +19,9 @@
 ;; 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:
 
@@ -29,9 +31,11 @@
 ;;;
 ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <peck@sun.com>
 
-(require 'cl)
+(eval-when-compile (require 'cl))
+(require 'sun-fns)
 
-(defvar sc::cursors nil "List of known cursors")
+(eval-and-compile
+  (defvar sc::cursors nil "List of known cursors"))
 
 (defmacro defcursor (name x y string)
   (if (not (memq name sc::cursors)) 
@@ -118,7 +122,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)
   )
 
@@ -211,6 +215,6 @@ Otherwise, ICON should be a vector or the name of a vector of [x y 32-chars]"
     (setq char (1+ (lsh char 1))))
   (if (not (eolp))(forward-char)))
 
-(provide 'sm-cursors)
+(provide 'sun-curs)
 
 ;;; sun-curs.el ends here