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 | |
| parent | 87e6e64f99de751c4459eb7acc6ac31e20db1f25 (diff) | |
| download | emacs-a12ac9d7951d68282e90fd49f218cc17d5342152.tar.gz | |
* lisp/emacs-lisp/autoload.el (make-autoload): Accept nil doc-string-elt.
Add cl-defun and cl-defmacro.
Fixes: debbugs:11649
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e52a213eab..0ad97e58935 100644 --- 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 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. |