aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
12011-10-24 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix. (Bug#9819)
4
12011-10-24 Michael Albinus <michael.albinus@gmx.de> 52011-10-24 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * notifications.el: Add the requirement of a running D-Bus session 7 * 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.
94Optional KEYMAP is the default keymap bound to the mode keymap. 94Optional KEYMAP is the default keymap bound to the mode keymap.
95 If non-nil, it should be a variable name (whose value is a keymap), 95 If non-nil, it should be a variable name (whose value is a keymap),
96 or an expression that returns either a keymap or a list of 96 or an expression that returns either a keymap or a list of
97 arguments for `easy-mmode-define-keymap'. If KEYMAP is not a symbol, 97 arguments for `easy-mmode-define-keymap'. If you supply a KEYMAP
98 this also defines the variable MODE-map. 98 argument that is not a symbol, this macro defines the variable
99 MODE-map and gives it the value that KEYMAP specifies.
99 100
100BODY contains code to execute each time the mode is enabled or disabled. 101BODY contains code to execute each time the mode is enabled or disabled.
101 It is executed after toggling the mode, and before running MODE-hook. 102 It is executed after toggling the mode, and before running MODE-hook.