diff options
| author | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:13:18 +0100 |
|---|---|---|
| committer | Anders Lindgren <andlind@gmail.com> | 2015-10-28 12:13:18 +0100 |
| commit | e69f7770611d85e130806763a46db7e212bc952f (patch) | |
| tree | 96bdd02003f21cea72a604d8f14a06ff99cd9744 /lisp/help.el | |
| parent | 0392e241b844487261d4dfcccc9a442793e0a868 (diff) | |
| parent | cc587a3539612d250d222363b18d15258e33f82a (diff) | |
| download | emacs-e69f7770611d85e130806763a46db7e212bc952f.tar.gz | |
Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/help.el b/lisp/help.el index 3387628fb8a..c558b652b7e 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1394,9 +1394,10 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"." (if (string-match "\n?\n\\'" docstring) (if (< (- (match-end 0) (match-beginning 0)) 2) "\n" "") "\n\n") - (if (and (stringp arglist) - (string-match "\\`([^ ]+\\(.*\\))\\'" arglist)) - (concat "(fn" (match-string 1 arglist) ")") + (if (stringp arglist) + (if (string-match "\\`[^ ]+\\(.*\\))\\'" arglist) + (concat "(fn" (match-string 1 arglist) ")") + (error "Unrecognized usage format")) (help--make-usage-docstring 'fn arglist))))) (defun help-function-arglist (def &optional preserve-names) |