[Emacs-diffs] /srv/bzr/emacs/trunk r106257: * lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a

[Andreas Schwab]

------------------------------------------------------------
revno: 106257
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-10-31 11:53:16 +0100
message:
  * lisp/subr.el (keymap--menu-item-with-binding): Ignore item if not a
  menu-item.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-31 00:37:09 +0000
+++ b/lisp/ChangeLog    2011-10-31 10:53:16 +0000
@@ -1,3 +1,8 @@
+2011-10-31  Andreas Schwab  <address@hidden>
+
+       * subr.el (keymap--menu-item-with-binding): Ignore item if not a
+       menu-item.
+
 2011-10-30  Vinicius Jose Latorre  <address@hidden>
 
        * whitespace.el: New version 13.2.2.

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2011-10-29 08:41:39 +0000
+++ b/lisp/subr.el      2011-10-31 10:53:16 +0000
@@ -624,6 +624,7 @@
 (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)))