summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-macs.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-13 07:45:30 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-05-13 07:45:30 -0700
commit1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5 (patch)
tree8a02e7689c33e13e15120508d724c497a14847c4 /lisp/emacs-lisp/cl-macs.el
parent97c05cc892af85abd9438d2f685d08c557a0d9fb (diff)
parent9c2a1a264cf418fcf187b95b49fe986b32ceabef (diff)
downloademacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.gz
emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.bz2
emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.zip
Merge from origin/emacs-25
9c2a1a2 * doc/misc/texinfo.tex: Sync from gnulib. 66cd4d8 * lisp/emacs-lisp/find-func.el (find-feature-regexp) (find-al... 1a5a05c Do not mistake colon at the end of regexp for slash symbol 4c5a00b Make package-install-from-buffer not move point 9596ea1 ; Revert "* emacs-lisp/lisp-mnt.el (lm-header): save-excursion" f79c352 Redo the fix for bug#21839 8d2f78c Don't treat JS spread as contination method call
Diffstat (limited to 'lisp/emacs-lisp/cl-macs.el')
-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)))