From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 19 May 2021 07:17:37 +0000 (+0200)
Subject: Fix recently introduced misbehavior of `quit-restore-window' (Bug#48493)
X-Git-Tag: emacs-28.0.90~2399
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=567c31121fdef6bdc8b645999a6ca1d994378c89;p=emacs.git

Fix recently introduced misbehavior of `quit-restore-window' (Bug#48493)

* lisp/window.el (quit-restore-window): Unconditionally call
`switch-to-prev-buffer' (Bug#48493).
---

diff --git a/lisp/window.el b/lisp/window.el
index 5a307136662..1c719480cab 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5110,8 +5110,7 @@ nil means to not handle the buffer in a particular way.  This
       (set-window-parameter window 'quit-restore nil)
       ;; Make sure that WINDOW is no more dedicated.
       (set-window-dedicated-p window nil)
-      (if prev-buffer
-          (switch-to-prev-buffer window bury-or-kill)
+      (unless (switch-to-prev-buffer window bury-or-kill)
         ;; Delete WINDOW if there is no previous buffer (Bug#48367).
         (window--delete window nil (eq bury-or-kill 'kill)))))