(derived-mode-run-hooks): Reinstalled, as it is needed for pre-21 compatibility.

Thanks to Stefan Monnier for pointing this out.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d92000d3d47f35df21d72d13b071f8887ec4cfd9..8dd7d27a166c7d543d759ac08f1907ab027c95cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,6 @@
 2005-07-15  Juanma Barranquero  <lekktu@gmail.com>
 
-       * emacs-lisp/derived.el (derived-mode-run-hooks): Remove.
-       (derived-mode-hook-name): Doc fix.
+       * emacs-lisp/derived.el (derived-mode-hook-name): Doc fix.
 
 2005-07-14  Dan Nicolaescu  <dann@ics.uci.edu>
 

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 244e3fb368cd52ecf463f6ccd13f9dcdf049bde9..764f58bcd23c22aae7ffff054df8517acf4232d4 100644 (file)
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -382,6 +382,12 @@ Always merge its parent into it, since the merge is non-destructive."
     (derived-mode-merge-abbrev-tables old-table new-table)
     (setq local-abbrev-table new-table)))
 
+(defun derived-mode-run-hooks (mode)
+   "Run the mode hook for MODE."
+   (let ((hooks-name (derived-mode-hook-name mode)))
+     (if (boundp hooks-name)
+         (run-hooks hooks-name))))
+
 ;; Functions to merge maps and tables.
 
 (defun derived-mode-merge-keymaps (old new)