* lisp/help-fns.el (describe-variable): Don't emit trailing whitespace (Bug#7511).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d3b38bba11564be12894b644695abdf4e2c2bf1..6002c388e90e4948ad4d0b6f747f23cb5898d1ca 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * help-fns.el (describe-variable): Don't emit trailing whitespace
+       (Bug#7511).
+
 2010-12-17  Leo  <sdl.web@gmail.com>
 
        * eshell/em-hist.el (eshell-previous-matching-input): Signal error

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 18db4f443f645d5f3119c2859ed99959d844527c..5743e1f601970e3e038b1bedcd189a2bddf6fbc3 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -632,21 +632,17 @@ it is displayed along with the global value."
                (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; "