Commit 2c18969c authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/help-fns.el (describe-variable): Use cl-print for the value

Use `pp-buffer' rather than `pp' so as to avoid calling prin1 twice.
parent 41f91d36
......@@ -391,12 +391,12 @@ suitable file is found, return nil."
;; If lots of ordinary text characters run this command,
;; don't mention them one by one.
(if (< (length non-modified-keys) 10)
(princ (mapconcat 'key-description keys ", "))
(princ (mapconcat #'key-description keys ", "))
(dolist (key non-modified-keys)
(setq keys (delq key keys)))
(if keys
(princ (mapconcat 'key-description keys ", "))
(princ (mapconcat #'key-description keys ", "))
(princ ", and many ordinary text characters"))
(princ "many ordinary text characters"))))
(when (or remapped keys non-modified-keys)
......@@ -842,15 +842,22 @@ it is displayed along with the global value."
(let ((line-beg (line-beginning-position))
(let ((rep
(let ((print-quoted t))
(prin1-to-string val))))
(let ((print-quoted t)
(print-circle t))
(cl-prin1-to-string val))))
(if (and (symbolp val) (not (booleanp val)))
(format-message "`%s'" rep)
(if (< (+ (length print-rep) (point) (- line-beg)) 68)
(insert " " print-rep)
(pp val)
(let ((buf (current-buffer)))
(insert print-rep)
(let ((pp-buffer (current-buffer)))
(with-current-buffer buf
(insert-buffer-substring pp-buffer)))))
;; Remove trailing newline.
(and (= (char-before) ?\n) (delete-char -1)))
(let* ((sv (get variable 'standard-value))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment