(define-derived-mode): Use {delay,run}-mode-hooks.

(derived-mode-p): Autoload.

diff --git a/lisp/derived.el b/lisp/derived.el
index 9512bae492fe779f953eb71b956d378af109a307..ffebfd5bc03c09f09c4d621f69e6acbdb1586ed9 100644 (file)
--- a/lisp/derived.el
+++ b/lisp/derived.el
@@ -151,7 +151,7 @@ been generated automatically, with a reference to the keymap."
         ,docstring
         (interactive)
                                        ; Run the parent.
-        ;; (combine-run-hooks
+        (delay-mode-hooks
 
          (,(or parent 'kill-all-local-variables))
                                        ; Identify the child mode.
@@ -181,12 +181,13 @@ been generated automatically, with a reference to the keymap."
          (setq local-abbrev-table ,abbrev)
                                        ; Splice in the body (if any).
          ,@body
-         ;; )
+         )
                                        ; Run the hooks, if any.
-        (run-hooks ',hook)))))
+        (run-mode-hooks ',hook)))))
 
 ;; PUBLIC: find if the current mode derives from another.
 
+;;; ;;;###autoload
 (defun derived-mode-p (&rest modes)
   "Non-nil if the current major mode is derived from one of MODES.
 Uses the `derived-mode-parent' property of the symbol to trace backwards."