[Emacs-diffs] /srv/bzr/emacs/trunk r108595: * lisp/emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt.

[Stefan Monnier]

------------------------------------------------------------
revno: 108595
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11649
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-13 08:46:33 -0400
message:
  * lisp/emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt.
  Add cl-defun and cl-defmacro.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-13 12:36:29 +0000
+++ b/lisp/ChangeLog    2012-06-13 12:46:33 +0000
@@ -1,3 +1,8 @@
+2012-06-13  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt
+       (bug#11649).  Add cl-defun and cl-defmacro.
+
 2012-06-13  Drew Adams  <address@hidden>
 
        * help-mode.el (help-bookmark-make-record, help-bookmark-jump):

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2012-06-10 13:28:26 +0000
+++ b/lisp/emacs-lisp/autoload.el       2012-06-13 12:46:33 +0000
@@ -151,7 +151,8 @@
                   easy-mmode-define-global-mode define-global-minor-mode
                   define-globalized-minor-mode
                   easy-mmode-define-minor-mode define-minor-mode
-                  defun* defmacro* define-overloadable-function))
+                  cl-defun defun* cl-defmacro defmacro*
+                   define-overloadable-function))
       (let* ((macrop (memq car '(defmacro defmacro*)))
             (name (nth 1 form))
             (args (cl-case car
@@ -161,7 +162,7 @@
                      ((define-generic-mode define-derived-mode
                         define-compilation-mode) nil)
                      (t)))
-            (body (nthcdr (get car 'doc-string-elt) form))
+            (body (nthcdr (or (get car 'doc-string-elt) 3) form))
             (doc (if (stringp (car body)) (pop body))))
         ;; Add the usage form at the end where describe-function-1
         ;; can recover it.