Merge changes from emacs-23 branch

[gnu-emacs] / lisp / help-fns.el

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b100a4e471dd55f3024159dec8d2bc9a0d143600..9b8e7f1458c1f983b79d2d73ef6e3d4ec00bf3d6 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -639,19 +639,16 @@ 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 0)))
+                     (delete-region from (1+ from))
+                   (delete-region (1- from) from))
                  (let* ((sv (get variable 'standard-value))
                         (origval (and (consp sv)
                                       (condition-case nil
@@ -666,7 +663,6 @@ it is displayed along with the global value."
                      (if (< (point) (+ from 20))
                          (delete-region (1- from) from)))))))
            (terpri)
-
            (when locus
              (if (bufferp locus)
                  (princ (format "%socal in buffer %s; "