From: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
Date: Tue, 29 Jul 2014 14:21:11 +0000 (+0200)
Subject: Fix Bug#18016.
X-Git-Tag: emacs-25.0.90~2636^3~9
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bca885a20f83220f93ad0d96af74fb84ab087d7;p=emacs.git
Fix Bug#18016.
menu-bar.el (menu-bar-update-buffers): Update item list format
in `buffers-menu' to confirm with changes to `get_keyelt'
(2014-07-02T01:49:31Z!monnier@iro.umontreal.ca). (Bug#18016)
---
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a54d4e2df6..b8477293e76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-29 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
+
+ * 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 <fgallina@gnu.org>
* progmodes/python.el (inferior-python-mode): Make input prompts
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 5ad4bed49b8..57acbbe648e 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1988,11 +1988,10 @@ It must accept a buffer as its only required argument.")
(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 @@ It must accept a buffer as its only required argument.")
(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)))