Use buffer display specifiers in buff-menu.el

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de7933d447884028ef1b88f721179669a947120b..be489c74df7a48af747a5aab19e06363af2db06c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -25,6 +25,9 @@
        (compilation-goto-locus): Use adjust-height specifier in
        display-buffer calls.
 
+       * buff-menu.el (Buffer-menu-switch-other-window)
+       (Buffer-menu-2-window): Use buffer display specifiers.
+
 2010-11-02  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (display-buffer-names): Describe `not-this-window' and

diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index e0f00d3553dd9e4244aef07ef99816941aa3ebd1..cf793a14854a11f14ca9cede366a03230b7ce578 100644 (file)
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -579,22 +579,16 @@ in the selected frame."
   "Make the other window select this line's buffer.
 The current window remains selected."
   (interactive)
-  (let ((pop-up-windows t)
-       same-window-buffer-names
-       same-window-regexps)
-    (display-buffer (Buffer-menu-buffer t))))
+  (display-buffer (Buffer-menu-buffer t) t))
 
 (defun Buffer-menu-2-window ()
   "Select this line's buffer, with previous buffer in second window."
   (interactive)
   (let ((buff (Buffer-menu-buffer t))
-       (menu (current-buffer))
-       (pop-up-windows t)
-       same-window-buffer-names
-       same-window-regexps)
+       (menu (current-buffer)))
     (delete-other-windows)
-    (switch-to-buffer (other-buffer))
-    (pop-to-buffer buff)
+    (display-buffer-same-window (other-buffer))
+    (pop-to-buffer buff t)
     (bury-buffer menu)))
 
 (defun Buffer-menu-toggle-read-only ()