andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix thinko in 'quit-restore-window'

Browse source 
* lisp/window.el (quit-restore-window): Try to restore the
previously selected window only if WINDOW is either the selected
window or BURY-OR-KILL is neither 'burying' nor 'killing'.
Otherwise, this might deliberately change the selected window,
for example, when 'kill-buffer-quit-windows' is non-nil and WINDOW
shows the buffer to kill.
This commit is contained in:
Martin Rudalics 2026-01-21 11:14:36 +01:00
parent 0d448871be
commit 2d758e73eb
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/window.el
View file

@ -5502,8 +5502,13 @@ elsewhere. This value is used by `quit-windows-on'."
;; If quit-restore-prev was not used, reset the quit-restore
;; parameter
(set-window-parameter window 'quit-restore nil))
;; If the previously selected window is still alive, select it.
(window--quit-restore-select-window quit-restore-2))
;; If WINDOW is the selected window and the previously selected
;; window is still alive, try to select that window. But do that
;; only if WINDOW is either the selected window or we are neither
;; "burying" nor "killing".
(unless (and (not (eq window (selected-window)))
(memq bury-or-kill '(killing burying)))
(window--quit-restore-select-window quit-restore-2)))
(t
;; Show some other buffer in WINDOW and leave the
;; quit-restore(-prev) parameters alone (Juri's idea).