X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fautoload.el;h=8ca8bbc5ffc11719707ecc466a21a4b20ef57cf8;hb=9d6f02ae4f88cbc87cb59679baecf5d201d9c82f;hp=195885ddce02ab122c6d7075d907b6030c6dd949;hpb=1cc5b779cb8755e01e02aead4fba711c06158b90;p=chise%2Fxemacs-chise.git

diff --git a/lisp/autoload.el b/lisp/autoload.el
index 195885d..8ca8bbc 100644
--- a/lisp/autoload.el
+++ b/lisp/autoload.el
@@ -40,30 +40,33 @@
 ;;; Code:
 
 (defun make-autoload (form file)
-  "Turn FORM, a defun or defmacro, into an autoload for source file FILE.
-Returns nil if FORM is not a defun, define-skeleton or defmacro."
+  "Turn a definition generator FORM into an autoload for source file FILE.
+Returns nil if FORM is not a defun, define-skeleton, define-derived-mode,
+or defmacro."
   (let ((car (car-safe form)))
-    (if (memq car '(defun define-skeleton defmacro))
+    (if (memq car '(defun define-skeleton defmacro define-derived-mode))
 	(let ((macrop (eq car 'defmacro))
 	      name doc)
 	  (setq form (cdr form)
 		name (car form)
 		;; Ignore the arguments.
-		form (cdr (if (eq car 'define-skeleton)
-			      form
-			    (cdr form)))
+		form (cdr (cond ((eq car 'define-skeleton)
+				 form)
+				((eq car 'define-derived-mode)
+				 (cddr form))
+				(t
+				 (cdr form))))
 		doc (car form))
 	  (if (stringp doc)
 	      (setq form (cdr form))
 	    (setq doc nil))
 	  (list 'autoload (list 'quote name) file doc
 		(or (eq car 'define-skeleton)
+		    (eq car 'define-derived-mode)
 		    (eq (car-safe (car form)) 'interactive))
 		(if macrop (list 'quote 'macro) nil)))
       nil)))
 
-(put 'define-skeleton 'doc-string-elt 3)
-
 (defvar generate-autoload-cookie ";;;###autoload"
   "Magic comment indicating the following form should be autoloaded.
 Used by `update-file-autoloads'.  This string should be
@@ -112,6 +115,8 @@ the section of autoloads for a file.")
 (put 'defvar   'doc-string-elt 3)
 (put 'defconst 'doc-string-elt 3)
 (put 'defmacro 'doc-string-elt 3)
+(put 'define-skeleton 'doc-string-elt 3)
+(put 'define-derived-mode 'doc-string-elt 4)
 
 (defun autoload-trim-file-name (file)
   "Returns a relative pathname of FILE including the last directory."
@@ -509,7 +514,7 @@ The directory to which the auto-autoloads.el file must be the first parameter
 on the command line."
   (unless noninteractive
     (error "batch-update-autoloads is to be used only with -batch"))
-  (let ((defdir default-directory)
+  (let ((defdir (directory-file-name default-directory))
 	(enable-local-eval nil))	; Don't query in batch mode.
     ;; (message "Updating autoloads in %s..." generated-autoload-file)
     (dolist (arg command-line-args-left)