[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.1 emacs/lisp/obsolete/sun-curs.el:1.2
*** emacs/lisp/obsolete/sun-curs.el:1.1 Thu Aug 30 03:31:09 2001
--- emacs/lisp/obsolete/sun-curs.el     Tue Feb  4 08:18:33 2003
***************
*** 39,45 ****
    (defvar sc::cursors nil "List of known cursors"))
  
  (defmacro defcursor (name x y string)
!   (if (not (memq name sc::cursors)) 
        (setq sc::cursors (cons name sc::cursors)))
    (list 'defconst name (list 'vector x y string)))
  
--- 39,45 ----
    (defvar sc::cursors nil "List of known cursors"))
  
  (defmacro defcursor (name x y string)
!   (if (not (memq name sc::cursors))
        (setq sc::cursors (cons name sc::cursors)))
    (list 'defconst name (list 'vector x y string)))
  
***************
*** 108,127 ****
    (delete-char -1)
    (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)
!   ("Pack to Icon" sc::pack-buffer-to-icon 
                  (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*))
    ("New Icon" call-interactively 'sc::make-cursor)
!   ("Edit Icon" sc:edit-cursor 
               (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*))
    ("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)
    ("Quit" sc::quit-edit)
--- 108,127 ----
    (delete-char -1)
    (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)
!   ("Pack to Icon" sc::pack-buffer-to-icon
                  (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*))
    ("New Icon" call-interactively 'sc::make-cursor)
!   ("Edit Icon" sc:edit-cursor
               (sc::menu-choose-cursor *menu-window* *menu-x* *menu-y*))
    ("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)
    ("Quit" sc::quit-edit)
***************
*** 153,159 ****
  
  (defun sc::menu-choose-cursor (window x y)
    "Presents a menu of cursor names, and returns one or nil"
!   (let ((curs sc::cursors) 
        (items))
      (while curs
        (push (sc::menu-item-for-cursor (car curs)) items)
--- 153,159 ----
  
  (defun sc::menu-choose-cursor (window x y)
    "Presents a menu of cursor names, and returns one or nil"
!   (let ((curs sc::cursors)
        (items))
      (while curs
        (push (sc::menu-item-for-cursor (car curs)) items)
***************
*** 200,206 ****
    (aset icon 2 (mapconcat 'sc::pack-one-line "1234567890123456" ""))
    (sc::goto-hotspot)
    )
!   
  (defun sc::pack-one-line (dummy)
    (let* (char chr1 chr2)
      (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char)
--- 200,206 ----
    (aset icon 2 (mapconcat 'sc::pack-one-line "1234567890123456" ""))
    (sc::goto-hotspot)
    )
! 
  (defun sc::pack-one-line (dummy)
    (let* (char chr1 chr2)
      (setq char 0 chr1 (mapconcat 'sc::pack-one-char "12345678" "") chr1 char)
***************
*** 212,218 ****
  (defun sc::pack-one-char (dummy)
    "pack following char into char, unless eolp"
    (if (or (eolp) (char-equal (following-char) 32))
!       (setq char (lsh char 1)) 
      (setq char (1+ (lsh char 1))))
    (if (not (eolp))(forward-char)))
  
--- 212,218 ----
  (defun sc::pack-one-char (dummy)
    "pack following char into char, unless eolp"
    (if (or (eolp) (char-equal (following-char) 32))
!       (setq char (lsh char 1))
      (setq char (1+ (lsh char 1))))
    (if (not (eolp))(forward-char)))