summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2016-05-12 00:48:37 +0300
committerDmitry Gutov <dgutov@yandex.ru>2016-05-12 00:48:37 +0300
commitf79c3523354e45e2dbc97bb92718c9941c1a1a3b (patch)
tree1fdc2e0df5a3717c516fa61e994cd5e94369018f /lisp/emacs-lisp
parent8d2f78c421c73730f344dbf71dbed61d5ef8e46d (diff)
downloademacs-f79c3523354e45e2dbc97bb92718c9941c1a1a3b.tar.gz
emacs-f79c3523354e45e2dbc97bb92718c9941c1a1a3b.tar.bz2
emacs-f79c3523354e45e2dbc97bb92718c9941c1a1a3b.zip
Redo the fix for bug#21839
* lisp/help.el (help-add-fundoc-usage): Undo the previous change. (help--make-usage-docstring): Escape newlines when printing. * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Ditto (bug#21839).
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-macs.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index ae52e8bebec..68abe67698c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -299,7 +299,8 @@ FORM is of the form (ARGS . BODY)."
;; Be careful with make-symbol and (back)quote,
;; see bug#12884.
(help--docstring-quote
- (let ((print-gensym nil) (print-quoted t))
+ (let ((print-gensym nil) (print-quoted t)
+ (print-escape-newlines t))
(format "%S" (cons 'fn (cl--make-usage-args
orig-args))))))
header)))