(describe-variable): Put value on same line

with preceding text, if it is short enough to look good that way.

diff --git a/lisp/help.el b/lisp/help.el
index 3cf53d2122736df017b2a35f5321a671ce3e978a..945b168f881060636338018f426d31a53021a294 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -858,7 +858,11 @@ it is displayed along with the global value."
                (terpri)
                (let ((from (point)))
                  (pp val)
-                 (help-xref-on-pp from (point))))))
+                 (help-xref-on-pp from (point))
+                 (if (< (point) (+ from 20))
+                     (save-excursion
+                       (goto-char from)
+                       (delete-char -1)))))))
          (terpri)
          (if (local-variable-p variable)
              (progn
@@ -875,7 +879,11 @@ it is displayed along with the global value."
                      ;; sensible size before prettyprinting.  -- fx
                      (let ((from (point)))
                        (pp val)
-                       (help-xref-on-pp from (point))))))
+                       (help-xref-on-pp from (point))
+                       (if (< (point) (+ from 20))
+                           (save-excursion
+                             (goto-char from)
+                             (delete-char -1)))))))
                (terpri)))
          (terpri)
          (with-current-buffer standard-output