# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1317722357 -3600
# Node ID 4a6f90020a59a08d19e11df2c3f02bf0647a320b
# Parent  0b6e7ae1e78f6d81a1aab4a45315f53c894d81a6
Avoid redundant arglist information, #'make-autoload.

lisp/ChangeLog addition:

2011-10-04  Aidan Kehoe  <kehoea@parhasard.net>

	* autoload.el (make-autoload):
	Don't add arglist info to the autoload form's docstring if the
	arglist info is already there.

diff -r 0b6e7ae1e78f -r 4a6f90020a59 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 04 09:02:14 2011 +0100
+++ b/lisp/ChangeLog	Tue Oct 04 10:59:17 2011 +0100
@@ -1,3 +1,9 @@
+2011-10-04  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* autoload.el (make-autoload):
+	Don't add arglist info to the autoload form's docstring if the
+	arglist info is already there.
+
 2011-10-04  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* bytecomp.el (byte-compile-funcall):
diff -r 0b6e7ae1e78f -r 4a6f90020a59 lisp/autoload.el
--- a/lisp/autoload.el	Tue Oct 04 09:02:14 2011 +0100
+++ b/lisp/autoload.el	Tue Oct 04 10:59:17 2011 +0100
@@ -283,7 +283,11 @@
 	     (name (nth 1 form))
 	     (body (nthcdr (get car 'doc-string-elt) form))
 	     (doc (if (stringp (car body)) (pop body))))
-	(if (memq car '(defmacro defmacro* defun defun*))
+	(if (and (memq car '(defmacro defmacro* defun defun*))
+                 (not (and doc (save-match-data
+                                 (string-match
+                                  "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'"
+                                  doc)))))
 	    (let ((arglist (nth 2 form)))
 	      (setq doc (concat (or doc "")
 				"\n\narguments: "