master 426675a 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit 426675a9596e55ac16706b26fdbe4fc5da9bc3fc
Merge: 0b7af60 293b8c7
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/emacs-lisp/easy-mmode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index dfbae74..0e4d6ee 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -163,8 +163,8 @@ BODY contains code to execute each time the mode is enabled 
or disabled.
                Not used if you also specify :variable.
 :lighter SPEC  Text displayed in the mode line when the mode is on.
 :keymap MAP    Keymap bound to the mode keymap.  Defaults to `MODE-map'.
-               If non-nil, it should be a variable name (whose value is
-               a keymap), or an expression that returns either a keymap or
+                If non-nil, it should be an unquoted variable name (whose value
+                is a keymap), or an expression that returns either a keymap or
                a list of (KEY . BINDING) pairs where KEY and BINDING are
                suitable for `define-key'.  If you supply a KEYMAP argument
                that is not a symbol, this macro defines the variable MODE-map