* lisp/emacs-lisp/autoload.el (make-autoload): Support cl-defgeneric

* lisp/emacs-lisp/cl-generic.el (cl-defgeneric): Tweak for autoloading.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 1b7ff36f422b440ca0fac5642e57b2a839fc0c21..d1f3c359f37197a948bf9cf0be8daef0579378e8 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -164,7 +164,7 @@ expression, in which case we want to handle forms differently."
      ((and (memq car '(easy-mmode-define-global-mode define-global-minor-mode
                        define-globalized-minor-mode defun defmacro
                       easy-mmode-define-minor-mode define-minor-mode
-                       define-inline cl-defun cl-defmacro))
+                       define-inline cl-defun cl-defmacro cl-defgeneric))
            (macrop car)
           (setq expand (let ((load-file-name file)) (macroexpand form)))
           (memq (car expand) '(progn prog1 defalias)))

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 6cc70c4c2f5a72f84da89dfb189ce13f222a6c10..d9321b13565ea6db7a6743750f3ab89767e485c2 100644 (file)
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -233,6 +233,7 @@ DEFAULT-BODY, if present, is used as the body of a default method.
              ,(help-add-fundoc-usage doc args))
            ,@(mapcar (lambda (method) `(cl-defmethod ,name ,@method))
                      (nreverse methods)))
+       :autoload-end
        ,@(mapcar (lambda (declaration)
                    (let ((f (cdr (assq (car declaration)
                                        defun-declarations-alist))))
@@ -1215,9 +1216,5 @@ Used internally for the (major-mode MODE) context specializers."
                     (progn (cl-assert (null modes)) mode)
                   `(derived-mode ,mode . ,modes))))
 
-;; Local variables:
-;; generated-autoload-file: "cl-loaddefs.el"
-;; End:
-
 (provide 'cl-generic)
 ;;; cl-generic.el ends here