[Emacs-diffs] Changes to emacs/lisp/register.el

[Richard M. Stallman]

Index: emacs/lisp/register.el
diff -c emacs/lisp/register.el:1.38 emacs/lisp/register.el:1.39
*** emacs/lisp/register.el:1.38 Thu Feb  7 12:40:44 2002
--- emacs/lisp/register.el      Wed Feb 13 20:47:50 2002
***************
*** 185,244 ****
    (princ "Register ")
    (princ (single-key-description register))
    (princ " contains ")
!   (cond
!    ((numberp val)
!     (princ val))
! 
!    ((markerp val)
!     (let ((buf (marker-buffer val)))
!       (if (null buf)
!         (princ "a marker in no buffer")
!       (princ "a buffer position:\n    buffer ")
!       (princ (buffer-name buf))
!       (princ ", position ")
!       (princ (marker-position val)))))
! 
!    ((and (consp val) (window-configuration-p (car val)))
!     (princ "a window configuration."))
! 
!    ((and (consp val) (frame-configuration-p (car val)))
!     (princ "a frame configuration."))
! 
!    ((and (consp val) (eq (car val) 'file))
!     (princ "the file ")
!     (prin1 (cdr val))
!     (princ "."))
! 
!    ((and (consp val) (eq (car val) 'file-query))
!     (princ "a file-query reference:\n    file ")
!     (prin1 (car (cdr val)))
!     (princ ",\n    position ")
!     (princ (car (cdr (cdr val))))
!     (princ "."))
! 
!    ((consp val)
!     (if verbose
!       (progn
!         (princ "the rectangle:\n")
!         (while val
!           (princ "    ")
!           (princ (car val))
!           (terpri)
!           (setq val (cdr val))))
!       (princ "a rectangle starting with ")
!       (princ (car val))))
! 
!    ((stringp val)
!     (if verbose
!       (progn
!         (princ "the text:\n")
!         (princ val))
!       (princ "text starting with\n    ")
!       (string-match "[^ \t\n].\\{,20\\}" val)
!       (princ (match-string 0 val))))
!    (t
!     (princ "Garbage:\n")
!     (if verbose (prin1 val)))))
  
  (defun insert-register (register &optional arg)
    "Insert contents of register REGISTER.  (REGISTER is a character.)
--- 185,245 ----
    (princ "Register ")
    (princ (single-key-description register))
    (princ " contains ")
!   (let ((val (get-register register)))
!     (cond
!      ((numberp val)
!       (princ val))
! 
!      ((markerp val)
!       (let ((buf (marker-buffer val)))
!       (if (null buf)
!           (princ "a marker in no buffer")
!         (princ "a buffer position:\n    buffer ")
!         (princ (buffer-name buf))
!         (princ ", position ")
!         (princ (marker-position val)))))
! 
!      ((and (consp val) (window-configuration-p (car val)))
!       (princ "a window configuration."))
! 
!      ((and (consp val) (frame-configuration-p (car val)))
!       (princ "a frame configuration."))
! 
!      ((and (consp val) (eq (car val) 'file))
!       (princ "the file ")
!       (prin1 (cdr val))
!       (princ "."))
! 
!      ((and (consp val) (eq (car val) 'file-query))
!       (princ "a file-query reference:\n    file ")
!       (prin1 (car (cdr val)))
!       (princ ",\n    position ")
!       (princ (car (cdr (cdr val))))
!       (princ "."))
! 
!      ((consp val)
!       (if verbose
!         (progn
!           (princ "the rectangle:\n")
!           (while val
!             (princ "    ")
!             (princ (car val))
!             (terpri)
!             (setq val (cdr val))))
!       (princ "a rectangle starting with ")
!       (princ (car val))))
! 
!      ((stringp val)
!       (if verbose
!         (progn
!           (princ "the text:\n")
!           (princ val))
!       (princ "text starting with\n    ")
!       (string-match "[^ \t\n].\\{,20\\}" val)
!       (princ (match-string 0 val))))
!      (t
!       (princ "Garbage:\n")
!       (if verbose (prin1 val))))))
  
  (defun insert-register (register &optional arg)
    "Insert contents of register REGISTER.  (REGISTER is a character.)