# HG changeset patch # User Richard M. Stallman # Date 1013651270 0 # Node ID d6866cd43406091a0e9b5565f7259f762ef59f93 # Parent 3198ecb4e71fddeb8c4d05e68b1d6b90df088a60 (describe-register-1): Access register contents here. diff -r 3198ecb4e71f -r d6866cd43406 lisp/register.el --- a/lisp/register.el Thu Feb 14 01:38:49 2002 +0000 +++ b/lisp/register.el Thu Feb 14 01:47:50 2002 +0000 @@ -185,60 +185,61 @@ (princ "Register ") (princ (single-key-description register)) (princ " contains ") - (cond - ((numberp val) - (princ val)) + (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))))) + ((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) (window-configuration-p (car val))) + (princ "a window configuration.")) - ((and (consp val) (frame-configuration-p (car val))) - (princ "a frame 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)) + (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 ".")) + ((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)))) + ((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))))) + ((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.)