From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 21 Feb 2022 15:46:23 +0000 (+0100)
Subject: Don't check whether a deleted window is deletable (Bug#54028)
X-Git-Tag: emacs-28.0.92~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=68d134cf0f784601e50cefc4056eb0ace510a982;p=emacs.git

Don't check whether a deleted window is deletable (Bug#54028)

* lisp/window.el (window-state-put): Make sure window is live
before calling 'window-deletable-p' on it (Bug#54028).
---

diff --git a/lisp/window.el b/lisp/window.el
index d9f36b9801f..a47a1216d10 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6410,7 +6410,11 @@ windows can get as small as `window-safe-min-height' and
 	(window--state-put-2 ignore pixelwise))
       (while window-state-put-stale-windows
 	(let ((window (pop window-state-put-stale-windows)))
-	  (when (eq (window-deletable-p window) t)
+          ;; Avoid that 'window-deletable-p' throws an error if window
+          ;; was already deleted when exiting 'with-temp-buffer' above
+          ;; (Bug#54028).
+	  (when (and (window-valid-p window)
+                     (eq (window-deletable-p window) t))
 	    (delete-window window))))
       (window--check frame))))