[Emacs-diffs] trunk r117887: * lisp/msb.el (msb--make-keymap-menu, msb-menu-bar-update-buffers):

[Stefan Monnier]

------------------------------------------------------------
revno: 117887
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18482
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-15 20:28:28 -0400
message:
  * lisp/msb.el (msb--make-keymap-menu, msb-menu-bar-update-buffers):
  Don't add outdated key-shortcut cache.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/msb.el                    msb.el-20091113204419-o5vbwnq5f7feedwu-821

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-15 00:20:21 +0000
+++ b/lisp/ChangeLog    2014-09-16 00:28:28 +0000
@@ -1,3 +1,8 @@
+2014-09-16  Stefan Monnier  <address@hidden>
+
+       * msb.el (msb--make-keymap-menu, msb-menu-bar-update-buffers):
+       Don't add outdated key-shortcut cache (bug#18482).
+
 2014-09-15  Glenn Morris  <address@hidden>
 
        * image.el (image-multi-frame-p): Fix thinko - do not force

=== modified file 'lisp/msb.el'
--- a/lisp/msb.el       2014-02-10 01:34:22 +0000
+++ b/lisp/msb.el       2014-09-16 00:28:28 +0000
@@ -1064,7 +1064,7 @@
     list))
 
 (defun msb--make-keymap-menu (raw-menu)
-  (let ((end (cons '(nil) 'menu-bar-select-buffer))
+  (let ((end 'menu-bar-select-buffer)
        (mcount 0))
     (mapcar
      (lambda (sub-menu)
@@ -1105,13 +1105,12 @@
            (setcdr (nthcdr msb-max-menu-items frames) nil))
          (setq frames-menu
                (nconc
-                (list 'frame f-title '(nil) 'keymap f-title)
+                (list 'frame f-title 'keymap f-title)
                 (mapcar
                  (lambda (frame)
                    (nconc
                     (list (frame-parameter frame 'name)
-                          (frame-parameter frame 'name)
-                          (cons nil nil))
+                          (frame-parameter frame 'name))
                      `(lambda ()
                         (interactive) (menu-bar-select-frame ,frame))))
                  frames)))))