diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-10 07:44:28 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-10 07:44:28 -0700 |
commit | 6d0703a01df1ece3fd9ba2a927913d1bcf10d549 (patch) | |
tree | e3492449c92c0895ac77853d0a8ea07c0ecfe24f /lisp/help.el | |
parent | 433d366dc7b053048abf710d790ff62421dd1570 (diff) | |
parent | d0d9f55b632717fccb605e0a204ebdd5ffe8608f (diff) | |
download | emacs-6d0703a01df1ece3fd9ba2a927913d1bcf10d549.tar.gz |
Merge from origin/emacs-25
d0d9f55 Allow newlines inside cl function arglists
963541a Publicize cl--generic-all-functions
3c581d5 ; Fix typo
e58f900 Add some "safe-local-variable" declarations for compatibility...
Diffstat (limited to 'lisp/help.el')
-rw-r--r-- | lisp/help.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/help.el b/lisp/help.el index efbae39a002..897cab5e371 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 "\\`[^ ]+\\(.*\\))\\'" arglist) + (if (string-match "\\`[^ ]+\\(\\(?:.\\|\n\\)*\\))\\'" arglist) (concat "(fn" (match-string 1 arglist) ")") (error "Unrecognized usage format")) (help--make-usage-docstring 'fn arglist))))) |