emacs-31 549d2f86379: Check for a live buffer in 'quit-restore-window'

Juri Linkov <[email protected]> Tue, 7 Jul 2026 11:24:13 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: emacs-31
commit 549d2f863794e8c1033307ad06da2ebd73271d3e
Author: Juri Linkov <[email protected]>
Commit: Juri Linkov <[email protected]>

    Check for a live buffer in 'quit-restore-window'
    
    * lisp/window.el (quit-restore-window):
    Check with 'buffer-live-p' when finding a prev buffer
    in 'window-prev-buffers' (bug#81370).
---
 lisp/window.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/window.el b/lisp/window.el
index 35b49a19a5e..ea0de1bad24 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5432,7 +5432,8 @@ elsewhere.  This value is used by `quit-windows-on'."
 	 (quit-restore-prev-2 (nth 2 quit-restore-prev))
          (prev-buffer (catch 'prev-buffer
                         (dolist (buf (window-prev-buffers window))
-                          (unless (eq (car buf) buffer)
+                          (when (and (not (eq (car buf) buffer))
+                                     (buffer-live-p (car buf)))
                             (throw 'prev-buffer (car buf))))))
          (dedicated (window-dedicated-p window))
 	 (frame (window-frame window))