summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/derived.el
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-11-14 23:05:53 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-11-14 23:05:53 +0000
commit156680e2dfb90f458c2b69024ba2c455d4ce5bb2 (patch)
tree996380882ff6f19e5f72c975802f595aa85fe43d /lisp/emacs-lisp/derived.el
parent2d10b62be6e272ceefdfa7d4516f0d8a73781c47 (diff)
downloademacs-156680e2dfb90f458c2b69024ba2c455d4ce5bb2.tar.gz
(define-derived-mode): Remove defvar for mode hook. (It conflicted
with defcustoms for some mode hooks.) Use the `variable-documentation' property to give the mode hook a docstring and expand that docstring.
Diffstat (limited to 'lisp/emacs-lisp/derived.el')
-rw-r--r--lisp/emacs-lisp/derived.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 8e1f79f95ee..e595ff92a39 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -194,7 +194,12 @@ See Info node `(elisp)Derived Modes' for more details."
parent child docstring syntax abbrev))
`(progn
- (defvar ,hook nil ,(format "Hook run when entering %s mode." name))
+ (unless (get ',hook 'variable-documentation)
+ (put ',hook 'variable-documentation
+ ,(format "Hook run when entering %s mode.
+No problems result if this variable is not bound.
+`add-hook' automatically binds it. (This is true for all hook variables.)"
+ name)))
(defvar ,map (make-sparse-keymap))
,(if declare-syntax
`(defvar ,syntax (make-syntax-table)))