2 files changed, 6 insertions, 14 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 257843eb7ff..d92000d3d47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/derived.el (derived-mode-run-hooks): Remove.
+        (derived-mode-hook-name): Doc fix.
+
 2005-07-14  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.el (term-mode): Disable cua-mode for term buffers.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index ef8e3288bbc..244e3fb368c 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -96,7 +96,7 @@
 ;;; PRIVATE: defsubst must be defined before they are first used
 
 (defsubst derived-mode-hook-name (mode)
-  "Construct the mode hook name based on mode name MODE."
+  "Construct a mode-hook name based on a MODE name."
   (intern (concat (symbol-name mode) "-hook")))
 
 (defsubst derived-mode-map-name (mode)
@@ -382,19 +382,6 @@ 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-setup-function (mode)
-;;;  "Run the setup function if it exists."
-
-;;;  (let ((fname (derived-mode-setup-function-name mode)))
-;;;    (if (fboundp fname)
-;;;     (funcall fname))))
-
-(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)