X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c8d3a25c0981020e1b8aa3bf96a4a0059be82431..0ea47a6159f351f32b7dbc68debe99eb02f2dd8d:/lisp/ebuff-menu.el

diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index f71554e9f6..5536f946dc 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,9 +1,10 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
-;; Copyright (C) 1985-1986, 1994, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1986, 1994, 2001-2016 Free Software Foundation,
+;; Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
@@ -132,7 +133,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 	    (setq select
 		  (catch 'electric-buffer-menu-select
 		    (message "<<< Type SPC or RET to bury the buffer list >>>")
-		    (setq unread-command-events (list (read-event)))
+		    (push (read-event) unread-command-events)
 		    (let ((start-point (point))
 			  (first (progn (goto-char (point-min))
 					(unless Buffer-menu-use-header-line
@@ -201,7 +202,7 @@ See the documentation of `electric-buffer-list' for details."
        "return to buffer editing"))
 
 (define-obsolete-function-alias 'Electric-buffer-menu-mode
-  'electric-buffer-menu-mode "24.2")
+  'electric-buffer-menu-mode "24.3")
 
 ;; generally the same as Buffer-menu-mode-map
 ;;  (except we don't indirect to global-map)
@@ -209,7 +210,9 @@ See the documentation of `electric-buffer-list' for details."
 
 (defun Electric-buffer-menu-exit ()
   (interactive)
-  (setq unread-command-events (listify-key-sequence (this-command-keys)))
+  (setq unread-command-events
+        (nconc (listify-key-sequence (this-command-keys))
+               unread-command-events))
   ;; for robustness
   (condition-case ()
       (throw 'electric-buffer-menu-select nil)
@@ -226,7 +229,7 @@ Select buffer at point and display buffers marked \">\" in other windows."
 (defun Electric-buffer-menu-mouse-select (event)
   (interactive "e")
   (select-window (posn-window (event-end event)))
-  (set-buffer (window-buffer (selected-window)))
+  (set-buffer (window-buffer))
   (goto-char (posn-point (event-end event)))
   (throw 'electric-buffer-menu-select (point)))