diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 08:46:33 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-13 08:46:33 -0400 |
| commit | a12ac9d7951d68282e90fd49f218cc17d5342152 (patch) | |
| tree | e853e07e78d02944f2f62ff83433d9198c643667 /lisp/emacs-lisp/autoload.el | |
| parent | 87e6e64f99de751c4459eb7acc6ac31e20db1f25 (diff) | |
| download | emacs-a12ac9d7951d68282e90fd49f218cc17d5342152.tar.gz emacs-a12ac9d7951d68282e90fd49f218cc17d5342152.tar.bz2 emacs-a12ac9d7951d68282e90fd49f218cc17d5342152.zip | |
* lisp/emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt.
Add cl-defun and cl-defmacro.
Fixes: debbugs:11649
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 9cd626c52f4..fba8915fd5f 100644 --- 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. |