From: Dmitry Gutov <dgutov@yandex.ru>
Date: Mon, 9 May 2016 23:53:20 +0000 (+0300)
Subject: Allow newlines inside cl function arglists
X-Git-Tag: emacs-25.0.94~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0d9f55;p=emacs.git

Allow newlines inside cl function arglists

* lisp/help.el (help-add-fundoc-usage): Allow newlines inside
ARGLIST (bug#21839).
---

diff --git a/lisp/help.el b/lisp/help.el
index 061daacfdd3..72893754e1e 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -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" "")
 	      "\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)))))