bug#52491: 28.0.90; Regression in window deletion with minibuffer

[martin rudalics <rudalics@gmx.at>]

[-- Attachment #1: Type: text/plain, Size: 825 bytes --]

 > I get nil too, but I don't believe this value.
 > Maybe because of some strange window interactions,
 > the displayed value is wrong.  When I tried to print
 > the real value with 'message' in the *Messages* value,
 > it was the same as in 27.2.90.

Well then ...

 > I checked that in 28 in 'quit-restore-window', only these 2 lines are used:
 >
 >       ((and dedicated (not (eq dedicated 'side))
 >             (window--delete window 'dedicated (eq bury-or-kill 'kill))))
 >
 > but these lines are not used in 28:
 >
 >        (when (window-live-p (nth 2 quit-restore))
 > 	(select-window (nth 2 quit-restore)))
 >
 > But in 27 they correctly selected the minibuffer window.

... the attached patch should cure it (I suppose this got broken in
commit d0c7d8bc22a935f2a79747a96b4043f0b449a212 but didn't check).

martin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: quit-restore.diff --]
[-- Type: text/x-patch; name="quit-restore.diff", Size: 2368 bytes --]

diff --git a/lisp/window.el b/lisp/window.el
index d12232641e..0db2dcbb90 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5171,10 +5171,7 @@ quit-restore-window
      ((and (not prev-buffer)
 	   (eq (nth 1 quit-restore) 'tab)
 	   (eq (nth 3 quit-restore) buffer))
-      (tab-bar-close-tab)
-      ;; If the previously selected window is still alive, select it.
-      (when (window-live-p (nth 2 quit-restore))
-	(select-window (nth 2 quit-restore))))
+      (tab-bar-close-tab))
      ((and (not prev-buffer)
 	   (or (eq (nth 1 quit-restore) 'frame)
 	       (and (eq (nth 1 quit-restore) 'window)
@@ -5184,10 +5181,7 @@ quit-restore-window
 		    (not (eq window (frame-root-window window)))))
 	   (eq (nth 3 quit-restore) buffer)
 	   ;; Delete WINDOW if possible.
-	   (window--delete window nil (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))))
+	   (window--delete window nil (eq bury-or-kill 'kill))))
      ((and (listp (setq quad (nth 1 quit-restore)))
 	   (buffer-live-p (car quad))
 	   (eq (nth 3 quit-restore) buffer))
@@ -5229,10 +5223,7 @@ quit-restore-window
 	(set-window-prev-buffers
 	 window (append (window-prev-buffers window) (list entry))))
       ;; Reset the quit-restore parameter.
-      (set-window-parameter window 'quit-restore nil)
-      ;; Select old window.
-      (when (window-live-p (nth 2 quit-restore))
-	(select-window (nth 2 quit-restore))))
+      (set-window-parameter window 'quit-restore nil))
      (t
       ;; Show some other buffer in WINDOW and reset the quit-restore
       ;; parameter.
@@ -5244,9 +5235,11 @@ quit-restore-window
       (if (switch-to-prev-buffer window bury-or-kill)
           (when (eq dedicated 'side)
             (set-window-dedicated-p window 'side))
-        (window--delete window nil (eq bury-or-kill 'kill))
-        (when (window-live-p (nth 2 quit-restore))
-          (select-window (nth 2 quit-restore))))))
+        (window--delete window nil (eq bury-or-kill 'kill)))))
+
+    ;; When the previously selected window is still live, select it.
+    (when (window-live-p (nth 2 quit-restore))
+      (select-window (nth 2 quit-restore)))

     ;; Deal with the buffer.
     (cond