Mercurial > emacs
changeset 48715:1e0c7ad65f05
(describe-register-1): Use window-width
to truncate string in a register. Check whether the string
in a register is an empty string or a sequence of white spaces.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 07 Dec 2002 21:29:35 +0000 |
| parents | 59758725d2cf |
| children | 376c832d1ca7 |
| files | lisp/register.el |
| diffstat | 1 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/register.el Sat Dec 07 20:57:53 2002 +0000 +++ b/lisp/register.el Sat Dec 07 21:29:35 2002 +0000 @@ -233,9 +233,18 @@ (progn (princ "the text:\n") (princ val)) - (princ "text starting with\n ") - (string-match "[^ \t\n].\\{,20\\}" val) - (princ (match-string 0 val)))) + (cond + ;; Extract first N characters starting with first non-whitespace. + ((string-match (format "[^ \t\n].\\{,%d\\}" + ;; Deduct 6 for the spaces inserted below. + (min 20 (max 0 (- (window-width) 6)))) + val) + (princ "text starting with\n ") + (princ (match-string 0 val))) + ((string-match "^[ \t\n]+$" val) + (princ "whitespace")) + (t + (princ "the empty string"))))) (t (princ "Garbage:\n") (if verbose (prin1 val))))))