# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1249917729 -3600
# Node ID e9b88e997479be2bc8611b570a25da4ea54eca53
# Parent  5a54ce6dc945279db370f99b25772b6d7aad352f
Deal with arglist newlines better, #'function-arglist, #'function-documentation

lisp/ChangeLog addition:

2009-08-10  Aidan Kehoe  <kehoea@parhasard.net>

	* help.el (function-arglist, function-documentation):
	Deal more gracefully with tabs in the function arglist; in
	function-documentation, when stripping the arglist, pay attention
	to the fact that they may span multiple lines.

diff -r 5a54ce6dc945 -r e9b88e997479 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 09 12:38:04 2009 +0100
+++ b/lisp/ChangeLog	Mon Aug 10 16:22:09 2009 +0100
@@ -1,3 +1,10 @@
+2009-08-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* help.el (function-arglist, function-documentation): 
+	Deal more gracefully with tabs in the function arglist; in
+	function-documentation, when stripping the arglist, pay attention
+	to the fact that they may span multiple lines.
+
 2009-08-09  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* faces.el (set-face-background-pixmap-file): 
diff -r 5a54ce6dc945 -r e9b88e997479 lisp/help.el
--- a/lisp/help.el	Sun Aug 09 12:38:04 2009 +0100
+++ b/lisp/help.el	Mon Aug 10 16:22:09 2009 +0100
@@ -1196,7 +1196,7 @@
 				    doc)
 				   (match-string 1 doc)))
                         (args (and args (replace-in-string args
-                                                           "[ ]*\\\\\n[ ]*"
+                                                           "[ ]*\\\\\n[ \t]*"
                                                            " " t))))
 		   ;; If there are no arguments documented for the
 		   ;; subr, rather don't print anything.
@@ -1225,7 +1225,7 @@
 	       (void-function "(alias for undefined function)")
 	       (error "(unexpected error from `documention')"))))
     (if (and strip-arglist
-	     (string-match "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'" doc))
+	     (string-match "[\n\t ]*\narguments: ?(\\([^)]*\\))\n?\\'" doc))
 	(setq doc (substring doc 0 (match-beginning 0))))
     doc))