Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 14 insertions, 21 deletions

diff --git a/src/window.c b/src/window.c
index 9961c54161d..db324effcce 100644
--- a/src/window.c
+++ b/src/window.c
@@ -468,6 +468,7 @@ Return WINDOW.  */)
   else
     {
       fset_selected_window (XFRAME (frame), window);
+      /* Don't clear FRAME's select_mini_window_flag here.  */
       return window;
     }
 }
@@ -517,6 +518,9 @@ select_window (Lisp_Object window, Lisp_Object norecord,
     /* Do not select a tooltip window (Bug#47207).  */
     error ("Cannot select a tooltip window");
 
+  /* We deinitely want to select WINDOW, not the mini-window.  */
+  f->select_mini_window_flag = false;
+
   /* Make the selected window's buffer current.  */
   Fset_buffer (w->contents);
 
@@ -3242,6 +3246,9 @@ window-start value is reasonable when this function is called.  */)
           if (EQ (selected_frame, w->frame))
             Fselect_window (window, Qnil);
           else
+            /* Do not clear f->select_mini_window_flag here.  If the
+               last selected window on F was an active minibuffer, we
+               want to return to it on a later Fselect_frame.  */
             fset_selected_window (f, window);
         }
     }
@@ -5141,37 +5148,23 @@ Signal an error when WINDOW is the only window on its frame.  */)
       adjust_frame_glyphs (f);
 
       if (!WINDOW_LIVE_P (FRAME_SELECTED_WINDOW (f)))
-        /* We deleted the frame's selected window.  */
+        /* We apparently deleted the frame's selected window; use the
+           frame's first window as substitute but don't record it yet.
+           `delete-window' may have something better up its sleeves.  */
         {
           /* Use the frame's first window as fallback ...  */
           Lisp_Object new_selected_window = Fframe_first_window (frame);
-          /* ... but preferably use its most recently used window.  */
-          Lisp_Object mru_window;
 
-          /* `get-mru-window' might fail for some reason so play it safe
-          - promote the first window _without recording it_ first.  */
           if (EQ (FRAME_SELECTED_WINDOW (f), selected_window))
             Fselect_window (new_selected_window, Qt);
           else
-            fset_selected_window (f, new_selected_window);
-
-          unblock_input ();
-
-          /* Now look whether `get-mru-window' gets us something.  */
-          mru_window = call1 (Qget_mru_window, frame);
-          if (WINDOW_LIVE_P (mru_window)
-              && EQ (XWINDOW (mru_window)->frame, frame))
-            new_selected_window = mru_window;
-
-          /* If all ended up well, we now promote the mru window.  */
-          if (EQ (FRAME_SELECTED_WINDOW (f), selected_window))
-            Fselect_window (new_selected_window, Qnil);
-          else
+            /* Do not clear f->select_mini_window_flag here.  If the
+               last selected window on F was an active minibuffer, we
+               want to return to it on a later Fselect_frame.  */
             fset_selected_window (f, new_selected_window);
         }
-      else
-        unblock_input ();
 
+      unblock_input ();
       FRAME_WINDOW_CHANGE (f) = true;
     }
   else