From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 16 Sep 2014 00:28:28 +0000 (-0400)
Subject: * lisp/msb.el (msb--make-keymap-menu, msb-menu-bar-update-buffers):
X-Git-Tag: emacs-25.0.90~2635^2~679^2~284
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a41eb66c104adbbc9040b817eee76a5aedd5d16;p=emacs.git

* lisp/msb.el (msb--make-keymap-menu, msb-menu-bar-update-buffers):
Don't add outdated key-shortcut cache.

Fixes: debbugs:18482
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b844bf38cb..bc514d29b10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* 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  <rgm@gnu.org>
 
 	* image.el (image-multi-frame-p): Fix thinko - do not force
diff --git a/lisp/msb.el b/lisp/msb.el
index 166c6c61e30..474d76bf6ca 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1064,7 +1064,7 @@ variable `msb-menu-cond'."
     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 @@ variable `msb-menu-cond'."
 	    (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)))))