diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-13 07:45:30 -0700 |
| commit | 1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5 (patch) | |
| tree | 8a02e7689c33e13e15120508d724c497a14847c4 /lisp/help.el | |
| parent | 97c05cc892af85abd9438d2f685d08c557a0d9fb (diff) | |
| parent | 9c2a1a264cf418fcf187b95b49fe986b32ceabef (diff) | |
| download | emacs-1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5.tar.gz | |
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/help.el')
| -rw-r--r-- | lisp/help.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el index 897cab5e371..b8485667ae0 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1412,7 +1412,7 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"." (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "") "\n\n") (if (stringp arglist) - (if (string-match "\\`[^ ]+\\(\\(?:.\\|\n\\)*\\))\\'" arglist) + (if (string-match "\\`[^ ]+\\(.*\\))\\'" arglist) (concat "(fn" (match-string 1 arglist) ")") (error "Unrecognized usage format")) (help--make-usage-docstring 'fn arglist))))) @@ -1485,7 +1485,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") (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) |