[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100317: * lisp/help-fns.el (describe-variable): Don't emit trailing whitespace (Bug#7511).

[Chong Yidong]

------------------------------------------------------------
revno: 100317
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-12-17 19:38:22 +0800
message:
  * lisp/help-fns.el (describe-variable): Don't emit trailing whitespace 
(Bug#7511).
modified:
  lisp/ChangeLog
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-17 11:04:40 +0000
+++ b/lisp/ChangeLog    2010-12-17 11:38:22 +0000
@@ -1,3 +1,8 @@
+2010-12-17  Chong Yidong  <address@hidden>
+
+       * help-fns.el (describe-variable): Don't emit trailing whitespace
+       (Bug#7511).
+
 2010-12-17  Leo  <address@hidden>
 
        * eshell/em-hist.el (eshell-previous-matching-input): Signal error

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2010-07-23 01:51:48 +0000
+++ b/lisp/help-fns.el  2010-12-17 11:38:22 +0000
@@ -632,21 +632,17 @@
                (if valvoid
                    (princ " is void as a variable.")
                  (princ "'s "))))
-           (if valvoid
-               nil
+           (unless valvoid
              (with-current-buffer standard-output
                (setq val-start-pos (point))
                (princ "value is ")
-               (terpri)
                (let ((from (point)))
+                 (terpri)
                  (pp val)
-                 ;; Hyperlinks in variable's value are quite frequently
-                 ;; inappropriate e.g C-h v <RET> features <RET>
-                 ;; (help-xref-on-pp from (point))
-                 (if (< (point) (+ from 20))
-                     (delete-region (1- from) from)))))
+                 (if (< (point) (- 68 (line-beginning-position -1)))
+                     (delete-region from (1+ from))
+                   (delete-region (1- from) from)))))
            (terpri)
-
            (when locus
              (if (bufferp locus)
                  (princ (format "%socal in buffer %s; "