[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 68d134cf0f: Don't check whether a deleted window is deletable (
From: |
Martin Rudalics |
Subject: |
emacs-28 68d134cf0f: Don't check whether a deleted window is deletable (Bug#54028) |
Date: |
Mon, 21 Feb 2022 10:47:59 -0500 (EST) |
branch: emacs-28
commit 68d134cf0f784601e50cefc4056eb0ace510a982
Author: Martin Rudalics <rudalics@gmx.at>
Commit: Martin Rudalics <rudalics@gmx.at>
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 d9f36b9801..a47a1216d1 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))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 68d134cf0f: Don't check whether a deleted window is deletable (Bug#54028),
Martin Rudalics <=