(describe-variable): Put value on same line

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

1 files changed, 10 insertions, 2 deletions

diff --git a/lisp/help.el b/lisp/help.el
index 3cf53d21227..945b168f881 100644
--- 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