2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74d578abf56..97ae0232d55 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * subr.el (keymap--menu-item-with-binding): Ignore item if not a
+        menu-item.
+
 2011-10-30  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * whitespace.el: New version 13.2.2.
diff --git a/lisp/subr.el b/lisp/subr.el
index 50ea49bd8c9..d5120826812 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -624,6 +624,7 @@ Don't call this function; it is for internal use only."
 (defun keymap--menu-item-with-binding (item binding)
   "Build a menu-item like ITEM but with its binding changed to BINDING."
   (cond
+   ((not (consp item)) binding)         ;Not a menu-item.
    ((eq 'menu-item (car item))
     (setq item (copy-sequence item))
     (let ((tail (nthcdr 2 item)))