(easy-menu-make-symbol): Don't wrap keyboard macros within lambdas.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a26d3997a639c19105b6563290eb1981daf108eb..6a7c7e1eabe3accea7f7b974a033075da20287c6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/easymenu.el (easy-menu-make-symbol): Don't wrap keyboard
+       macros within lambdas.
+
 2008-04-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuffer.el (completion-try-completion): Add `point' argument.

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index ca5151fa9846bdea33a3484e44ba3217fdf184d3..8e2f4322c03cacd653187c283cb4e621e98c0c73 100644 (file)
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -470,7 +470,10 @@ When non-nil, NOEXP indicates that CALLBACK cannot be an expression
         (make-symbol (format "menu-function-%d" easy-menu-item-count))))
     (setq easy-menu-item-count (1+ easy-menu-item-count))
     (fset command
-         (if (or (keymapp callback) (functionp callback) noexp) callback
+         (if (or (keymapp callback) (commandp callback)
+                  ;; `functionp' is probably not needed.
+                  (functionp callback) noexp)
+              callback
            `(lambda () (interactive) ,callback)))
     command))