[Emacs-diffs] trunk r117607: Fix Bug#18016.

[Rüdiger Sonderfeld]

------------------------------------------------------------
revno: 117607
revision-id: address@hidden
parent: address@hidden
committer: Rüdiger Sonderfeld <address@hidden>
branch nick: trunk
timestamp: Tue 2014-07-29 16:21:11 +0200
message:
  Fix Bug#18016.
  
  menu-bar.el (menu-bar-update-buffers): Update item list format
  in `buffers-menu' to confirm with changes to `get_keyelt'
  (r117463).  (Bug#18016)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-28 21:07:10 +0000
+++ b/lisp/ChangeLog    2014-07-29 14:21:11 +0000
@@ -1,3 +1,9 @@
+2014-07-29  Rüdiger Sonderfeld  <address@hidden>
+
+       * menu-bar.el (menu-bar-update-buffers): Update item list format
+       in `buffers-menu' to confirm with changes to `get_keyelt'
+       (r117463).  (Bug#18016)
+
 2014-07-28  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (inferior-python-mode): Make input prompts

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2014-07-27 13:21:30 +0000
+++ b/lisp/menu-bar.el  2014-07-29 14:21:11 +0000
@@ -1988,11 +1988,10 @@
                    (dolist (pair alist)
                      (setq i (1- i))
                      (aset buffers-vec i
-                          (nconc (list (car pair)
-                                       (cons nil nil))
-                                 `(lambda ()
-                                     (interactive)
-                                     (funcall menu-bar-select-buffer-function 
,(cdr pair))))))
+                          (cons (car pair)
+                                 `(lambda ()
+                                    (interactive)
+                                    (funcall menu-bar-select-buffer-function 
,(cdr pair))))))
                    (list buffers-vec))))
 
         ;; Make a Frames menu if we have more than one frame.
@@ -2004,10 +2003,8 @@
                   (i 0))
              (dolist (frame frames)
                (aset frames-vec i
-                     (nconc
-                      (list
-                       (frame-parameter frame 'name)
-                       (cons nil nil))
+                     (cons
+                      (frame-parameter frame 'name)
                       `(lambda ()
                          (interactive) (menu-bar-select-frame ,frame))))
                (setq i (1+ i)))