3 files changed, 15 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5fdf4deb8af..060c238c725 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/autoload.el (make-autoload): Handle defclass form.
+
+        * emacs-lisp/eieio.el (eieio-defclass-autoload): Autoload.
+
 2009-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacs-lisp/autoload.el (generated-autoload-load-name): New var.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 8b2a8985229..9dad31af0e3 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -135,6 +135,14 @@ or macro definition or a defcustom)."
                   (eq (car-safe (car body)) 'interactive))
               (if macrop (list 'quote 'macro) nil))))
 
+     ;; For defclass forms, use `eieio-defclass-autoload'.
+     ((eq car 'defclass)
+      (let ((name (nth 1 form))
+            (superclasses (nth 2 form))
+            (doc (nth 4 form)))
+        (list 'eieio-defclass-autoload (list 'quote name)
+              (list 'quote superclasses) file doc)))
+
      ;; Convert defcustom to less space-consuming data.
      ((eq car 'defcustom)
       (let ((varname (car-safe (cdr-safe form)))
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 09a1710dc67..28af9bad419 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -331,6 +331,7 @@ wish, and reference them using the function `class-option'."
 (defvar eieio-defclass-autoload-map (make-vector 7 nil)
   "Symbol map of superclasses we find in autoloads.")
 
+;;;###autoload
 (defun eieio-defclass-autoload (cname superclasses filename doc)
   "Create autoload symbols for the EIEIO class CNAME.
 SUPERCLASSES are the superclasses that CNAME inherites from.