mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Redo the fix for bug#21839

Browse Source 
* 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).
This commit is contained in:
Dmitry Gutov 2016-05-12 00:48:37 +03:00
parent 8d2f78c421
commit f79c352335
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/emacs-lisp/cl-macs.el
View File

@ -299,7 +299,8 @@ FORM is of the form (ARGS . BODY)."
;; Be careful with make-symbol and (back)quote, ;; Be careful with make-symbol and (back)quote,
;; see bug#12884. ;; see bug#12884.
(help--docstring-quote (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 (format "%S" (cons 'fn (cl--make-usage-args
orig-args)))))) orig-args))))))
header))) header)))

5
lisp/help.el
View File

@ -1395,7 +1395,7 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
(if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "") (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "")
"\n\n") "\n\n")
(if (stringp arglist) (if (stringp arglist)
(if (string-match "\\`[^ ]+\\(\\(?:.\\|\n\\)*\\))\\'" arglist) (if (string-match "\\`[^ ]+\\(.*\\))\\'" arglist)
(concat "(fn" (match-string 1 arglist) ")") (concat "(fn" (match-string 1 arglist) ")")
(error "Unrecognized usage format")) (error "Unrecognized usage format"))
(help--make-usage-docstring 'fn arglist))))) (help--make-usage-docstring 'fn arglist)))))
@ -1468,7 +1468,8 @@ the same names as used in the original source code, when possible."
(define-obsolete-function-alias 'help-make-usage 'help--make-usage "25.1") (define-obsolete-function-alias 'help-make-usage 'help--make-usage "25.1")
(defun help--make-usage-docstring (fn arglist) (defun help--make-usage-docstring (fn arglist)
(help--docstring-quote (format "%S" (help--make-usage fn arglist)))) (let ((print-escape-newlines t))
(help--docstring-quote (format "%S" (help--make-usage fn arglist)))))
(provide 'help) (provide 'help)