From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 31 Oct 2011 10:53:16 +0000 (+0100)
Subject: * lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a
X-Git-Tag: emacs-pretest-24.0.92~245
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08e1d82c8818959ce2885519fe138172e2db5bf3;p=emacs.git

* lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a
menu-item.
---

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)))