diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-23 06:31:26 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-23 06:31:26 +0100 |
| commit | be38405b1f5309c14668510ccc7c1306f399de6e (patch) | |
| tree | 8550f374f09e09b18f2e7b3a53a2fe8a8d011fa8 /lisp/window.el | |
| parent | b1cfdb3573facdceae3785478c62c2e2548564ec (diff) | |
| parent | 29fffbdd87391272e9131be63cf93f5067d6ae0d (diff) | |
| download | emacs-be38405b1f5309c14668510ccc7c1306f399de6e.tar.gz emacs-be38405b1f5309c14668510ccc7c1306f399de6e.tar.bz2 emacs-be38405b1f5309c14668510ccc7c1306f399de6e.zip | |
Merge from origin/emacs-28
29fffbdd87 Revert field-related thingatpt changes
9bcb732686 * lisp/window.el (quit-restore-window): Select previously ...
b7d31d6192 Revert "Remove Motif support"
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 0f17bb28b4c..aff99d36c59 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5151,7 +5151,10 @@ nil means to not handle the buffer in a particular way. This (cond ;; First try to delete dedicated windows that are not side windows. ((and dedicated (not (eq dedicated 'side)) - (window--delete window 'dedicated (eq bury-or-kill 'kill)))) + (window--delete window 'dedicated (eq bury-or-kill 'kill))) + ;; If the previously selected window is still alive, select it. + (when (window-live-p (nth 2 quit-restore)) + (select-window (nth 2 quit-restore)))) ((and (not prev-buffer) (eq (nth 1 quit-restore) 'tab) (eq (nth 3 quit-restore) buffer)) |