From 68d134cf0f784601e50cefc4056eb0ace510a982 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 21 Feb 2022 16:46:23 +0100 Subject: [PATCH] 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). --- lisp/window.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)))) -- 2.39.2