# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292585902 -28800
# Node ID bc7bbc0dbad44bd82c20962a2ad2ad8b9be55466
# Parent  1af8fe6a8d5553d8bab7c53dde426b3a27964881
* lisp/help-fns.el (describe-variable): Don't emit trailing whitespace (Bug#7511).

diff -r 1af8fe6a8d55 -r bc7bbc0dbad4 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 17 19:16:10 2010 +0800
+++ b/lisp/ChangeLog	Fri Dec 17 19:38:22 2010 +0800
@@ -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 -r 1af8fe6a8d55 -r bc7bbc0dbad4 lisp/help-fns.el
--- a/lisp/help-fns.el	Fri Dec 17 19:16:10 2010 +0800
+++ b/lisp/help-fns.el	Fri Dec 17 19:38:22 2010 +0800
@@ -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; "