From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 23 Oct 2016 13:02:11 +0000 (+0300)
Subject: Revert "* lisp/ibuffer.el (ibuffer): Improve 'other-window' case.  (Bug#23617)"
X-Git-Tag: emacs-25.1.90~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1dd7b54a7e7a0b2b4f3391f09960acc9866b7190;p=emacs.git

Revert "* lisp/ibuffer.el (ibuffer): Improve 'other-window' case.  (Bug#23617)"

This reverts commit cf3c19b0298236293d9c56d5ba425af4f42c1f8e.
Do not merge to master!
---

diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 1295ed7a82d..9d23e64cd81 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2336,8 +2336,7 @@ FORMATS is the value to use for `ibuffer-formats'.
     (setq other-window-p t))
   (let ((buf (get-buffer-create (or name "*Ibuffer*"))))
     (if other-window-p
-	(or (and noselect (display-buffer buf t))
-	    (pop-to-buffer buf t))
+	(funcall (if noselect (lambda (buf) (display-buffer buf t)) #'pop-to-buffer) buf)
       (funcall (if noselect #'display-buffer #'switch-to-buffer) buf))
     (with-current-buffer buf
       (save-selected-window