[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100385: * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the

[Stefan Monnier]

------------------------------------------------------------
revno: 100385
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-01-17 16:42:23 -0500
message:
  * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
  keymap expression.  Improve docstring.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/easy-mmode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-15 02:32:19 +0000
+++ b/lisp/ChangeLog    2011-01-17 21:42:23 +0000
@@ -1,3 +1,8 @@
+2011-01-17  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
+       keymap expression.  Improve docstring.
+
 2011-01-15  Mark Diekhans  <address@hidden>
 
        * files.el (backup-buffer): Make last-resort backup file in

=== modified file 'lisp/emacs-lisp/easy-mmode.el'
--- a/lisp/emacs-lisp/easy-mmode.el     2011-01-02 23:50:46 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el     2011-01-17 21:42:23 +0000
@@ -93,8 +93,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),
-  a keymap, or a list of arguments for `easy-mmode-define-keymap'.
-  If KEYMAP is a keymap or list, this also defines the variable MODE-map.
+  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.
 
 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.
@@ -256,7 +257,7 @@
             (let ((m ,keymap))
               (cond ((keymapp m) m)
                     ((listp m) (easy-mmode-define-keymap m))
-                    (t (error "Invalid keymap %S" ,keymap))))
+                    (t (error "Invalid keymap %S" m))))
             ,(format "Keymap for `%s'." mode-name)))
 
        (add-minor-mode ',mode ',lighter