[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d160f53 2/2: Have describe-variable output multi-li
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master d160f53 2/2: Have describe-variable output multi-line values better |
Date: |
Thu, 28 Apr 2016 13:24:26 +0000 |
branch: master
commit d160f530328fa2872296485b92602435921bd4fd
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <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).
---
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 c3a5f26..e2cb9f8 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -758,9 +758,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))
@@ -769,17 +768,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)))