summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-print.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-06-29 19:42:32 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-06-29 19:42:32 -0400
commit169532b0ebc3acb0b1c943d0b3d8b569cd57ca4b (patch)
tree60d7ae515b92944d1e90772df3ae5dac05b5c715 /lisp/emacs-lisp/cl-print.el
parent138447c3abd749d1c27d99d7089b1b0903352ade (diff)
parentc87c87fcc361494815bbd1d92f450b0b80a3ecbb (diff)
downloademacs-169532b0ebc3acb0b1c943d0b3d8b569cd57ca4b.tar.gz
emacs-169532b0ebc3acb0b1c943d0b3d8b569cd57ca4b.tar.bz2
emacs-169532b0ebc3acb0b1c943d0b3d8b569cd57ca4b.zip
; Merge: Backtrace printing improvements (Bug#6991)
Diffstat (limited to 'lisp/emacs-lisp/cl-print.el')
-rw-r--r--lisp/emacs-lisp/cl-print.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el
index 89a71d1b6c5..824d0b7b4f5 100644
--- a/lisp/emacs-lisp/cl-print.el
+++ b/lisp/emacs-lisp/cl-print.el
@@ -105,10 +105,11 @@ into a button whose action shows the function's disassembly.")
(if args
(prin1 args stream)
(princ "()" stream)))
- (let ((doc (documentation object 'raw)))
- (when doc
- (princ " " stream)
- (prin1 doc stream)))
+ (pcase (help-split-fundoc (documentation object 'raw) object)
+ ;; Drop args which `help-function-arglist' already printed.
+ (`(,_usage . ,(and doc (guard (stringp doc))))
+ (princ " " stream)
+ (prin1 doc stream)))
(let ((inter (interactive-form object)))
(when inter
(princ " " stream)