summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-10-24 13:37:03 -0400
committerGlenn Morris <rgm@gnu.org>2011-10-24 13:37:03 -0400
commitc1ebb47e3da1840bb438372f67335df1d30c4ffd (patch)
tree63d8d71bbde1abe5364bd3c37fcb54c055853383 /lisp
parentfbecbfb92b83a508ef299343f7dd9313086a885a (diff)
downloademacs-c1ebb47e3da1840bb438372f67335df1d30c4ffd.tar.gz
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/easy-mmode.el5
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03e0ba3ef89..57b89b973f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-24 Glenn Morris <rgm@gnu.org>
+
+ * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819)
+
2011-10-24 Michael Albinus <michael.albinus@gmx.de>
* notifications.el: Add the requirement of a running D-Bus session
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index b1cb0615e43..4b6f4d634ca 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -94,8 +94,9 @@ Optional LIGHTER is displayed in the modeline when the mode is on.
Optional KEYMAP is the default keymap bound to the mode keymap.
If non-nil, it should be a variable name (whose value is a keymap),
or an expression that returns either a keymap or a list of
- arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol,
- this also defines the variable MODE-map.
+ arguments for `easy-mmode-define-keymap'. If you supply a KEYMAP
+ argument that is not a symbol, this macro defines the variable
+ MODE-map and gives it the value that KEYMAP specifies.
BODY contains code to execute each time the mode is enabled or disabled.
It is executed after toggling the mode, and before running MODE-hook.