* lisp/emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt.

Add cl-defun and cl-defmacro.

Fixes: debbugs:11649

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e52a213eab0c3ea75d7fee9774f346ab4211fb4..0ad97e58935f680d017428b4b62dd78aff66411d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt
+       (bug#11649).  Add cl-defun and cl-defmacro.
+
 2012-06-13  Drew Adams  <drew.adams@oracle.com>
 
        * help-mode.el (help-bookmark-make-record, help-bookmark-jump):

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 9cd626c52f4c60f71e7b9bbc3dc6b2ca6407c485..fba8915fd5f021a4b00b9ac1f0f183d9aa50f24b 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -151,7 +151,8 @@ expression, in which case we want to handle forms differently."
                   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 @@ expression, in which case we want to handle forms differently."
                      ((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.