[Emacs-diffs] Changes to emacs/lisp/obsolete/sun-curs.el

[Juanma Barranquero]

Index: emacs/lisp/obsolete/sun-curs.el
diff -c emacs/lisp/obsolete/sun-curs.el:1.5 emacs/lisp/obsolete/sun-curs.el:1.6
*** emacs/lisp/obsolete/sun-curs.el:1.5 Sat Aug  6 17:48:15 2005
--- emacs/lisp/obsolete/sun-curs.el     Wed Aug 24 15:54:20 2005
***************
*** 32,38 ****
  ;;;
  ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <address@hidden>
  
! (eval-when-compile (require 'cl))
  (require 'sun-fns)
  
  (eval-and-compile
--- 32,43 ----
  ;;;
  ;;; 9-dec-86 Jeff Peck, Sun Microsystems Inc. <address@hidden>
  
! (eval-when-compile
!   (require 'cl)
!   (defvar *edit-icon*) (defvar char)
!   ;; These are from term/sun-mouse.el
!   (defvar *mouse-window*) (defvar *mouse-x*) (defvar *mouse-y*) (defvar menu))
! 
  (require 'sun-fns)
  
  (eval-and-compile
***************
*** 79,87 ****
    (if (symbolp icon) (setq icon (symbol-value icon)))
    (sun-change-cursor-icon icon))
  
  (make-local-variable '*edit-icon*)
  (make-variable-buffer-local 'icon-edit)
- (setq-default icon-edit nil)
  (or (assq 'icon-edit minor-mode-alist)
      (push '(icon-edit " IconEdit") minor-mode-alist))
  
--- 84,94 ----
    (if (symbolp icon) (setq icon (symbol-value icon)))
    (sun-change-cursor-icon icon))
  
+ ;; This does not make much sense...
  (make-local-variable '*edit-icon*)
+ 
+ (defvar icon-edit nil)
  (make-variable-buffer-local 'icon-edit)
  (or (assq 'icon-edit minor-mode-alist)
      (push '(icon-edit " IconEdit") minor-mode-alist))
  
***************
*** 109,117 ****
    (insert char)
    (sc::goto-hotspot))
  
- (defun sc::menu-function (window x y)
-   (sun-menu-evaluate window (1+ x) y sc::menu))
- 
  (defmenu sc::menu
    ("Cursor Menu")
    ("Pack & Use" sc::pack-buffer-to-cursor)
--- 116,121 ----
***************
*** 127,132 ****
--- 131,139 ----
    ("Quit" sc::quit-edit)
    )
  
+ (defun sc::menu-function (window x y)
+   (sun-menu-evaluate window (1+ x) y sc::menu))
+ 
  (defun sc::quit-edit ()
    (interactive)
    (bury-buffer (current-buffer))
***************
*** 202,208 ****
    )
  
  (defun sc::pack-one-line (dummy)
!   (let* (char chr1 chr2)
      (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char)
      (setq char 0 chr2 (mapconcat 'sc::pack-one-char "12345678" "") chr2 char)
      (forward-line 1)
--- 209,215 ----
    )
  
  (defun sc::pack-one-line (dummy)
!   (let (char chr1 chr2)
      (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char)
      (setq char 0 chr2 (mapconcat 'sc::pack-one-char "12345678" "") chr2 char)
      (forward-line 1)