(derived-mode-hooks-name): Use -hook, not -hooks, in mode hook name.

(derived-mode-hook-name): Renamed from ...-hooks; caller changed.

diff --git a/lisp/derived.el b/lisp/derived.el
index d50ac6d288c978e2081ee64933eb6202fe286128..1283b2f5ba8bb2fc2a507c7291c17dd93eb27f50 100644 (file)
--- a/lisp/derived.el
+++ b/lisp/derived.el
@@ -74,7 +74,7 @@
 ;;   default, but may be redefined by the user to contain special
 ;;   commands (ie. setting local variables like 'outline-regexp')
 ;;   **NOTE: do not use this option -- it will soon be obsolete.
-;; - run anything assigned to 'hypertext-mode-hooks' (obsolete, but
+;; - run anything assigned to 'hypertext-mode-hook' (obsolete, but
 ;;   supported for the sake of compatibility).
 ;;
 ;; The advantages of this system are threefold.  First, text mode is
@@ -166,7 +166,7 @@ been generated automatically, with a reference to the keymap."
 ;;;                                    ; any -- this will soon be
 ;;;                                    ; obsolete.
 ;;;     (derived-mode-run-setup-function '(, child))
-                                       ; Run the hooks, if any.
+                                       ; Run the hook, if any.
         (derived-mode-run-hooks '(, child))))))
 
 
@@ -187,9 +187,9 @@ Use the `derived-mode-parent' property of the symbol to trace backwards."
   "Construct a setup-function name based on a mode name."
   (intern (concat (symbol-name mode) "-setup")))
 
-(defsubst derived-mode-hooks-name (mode)
-  "Construct a hooks name based on a mode name."
-  (intern (concat (symbol-name mode) "-hooks")))
+(defsubst derived-mode-hook-name (mode)
+  "Construct the mode hook name based on mode name MODE."
+  (intern (concat (symbol-name mode) "-hook")))
 
 (defsubst derived-mode-map-name (mode)
   "Construct a map name based on a mode name."
@@ -293,9 +293,9 @@ Always merge its parent into it, since the merge is non-destructive."
 ;;;    (funcall fname))))
 
 (defun derived-mode-run-hooks (mode)
-  "Run the hooks if they exist."
+  "Run the mode hook for MODE."
 
-  (let ((hooks-name (derived-mode-hooks-name mode)))
+  (let ((hooks-name (derived-mode-hook-name mode)))
     (if (boundp hooks-name)
        (run-hooks hooks-name))))