From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 28 Oct 2015 00:18:45 +0000 (-0400)
Subject: * lisp/help.el: Fix bug with incorrect arglist string
X-Git-Tag: emacs-25.0.90~1003^2^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4eb1e7f96b6c3758c321aed7523502089a8ede74;p=emacs.git

* lisp/help.el: Fix bug with incorrect arglist string

(help-add-fundoc-usage): Don't mistake a mis-formatted string for a list.
---

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)