[Emacs-diffs] scratch/backports-25.2 18f1ab7 30/46: Have describe-variable output multi-line values better

[Noam Postavsky]

branch: scratch/backports-25.2
commit 18f1ab7716ac49e0271d162c99ac462786d76d13
Author: Lars Ingebrigtsen <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Have describe-variable output multi-line values better
    
    * lisp/help-fns.el (describe-variable): When printing
    multi-line expressions, display them prettier (bug#10723).
    
    (cherry picked from commit d160f530328fa2872296485b92602435921bd4fd)
---
 lisp/help-fns.el |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 26d8839..e701510 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -760,9 +760,8 @@ it is displayed along with the global value."
            (unless valvoid
              (with-current-buffer standard-output
                (setq val-start-pos (point))
-               (princ "value is ")
-               (let ((from (point))
-                     (line-beg (line-beginning-position))
+               (princ "value is")
+               (let ((line-beg (line-beginning-position))
                      (print-rep
                       (let ((rep
                              (let ((print-quoted t))
@@ -771,17 +770,17 @@ it is displayed along with the global value."
                             (format-message "`%s'" rep)
                           rep))))
                  (if (< (+ (length print-rep) (point) (- line-beg)) 68)
-                     (insert print-rep)
+                     (insert " " print-rep)
                    (terpri)
                    (pp val)
-                   (if (< (point) (+ 68 (line-beginning-position 0)))
-                       (delete-region from (1+ from))
-                     (delete-region (1- from) from)))
+                    ;; Remove trailing newline.
+                    (delete-char -1))
                  (let* ((sv (get variable 'standard-value))
                         (origval (and (consp sv)
                                       (condition-case nil
                                           (eval (car sv))
-                                        (error :help-eval-error)))))
+                                        (error :help-eval-error))))
+                         from)
                    (when (and (consp sv)
                                (not (equal origval val))
                                (not (equal origval :help-eval-error)))