Merge remote-tracking branch 'origin/master' into 'feature/type-hierarchy'

1 files changed, 10 insertions, 1 deletions

diff --git a/src/window.c b/src/window.c
index 915f591221d..0c84b4f4bf3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4151,6 +4151,8 @@ set_window_buffer (Lisp_Object window, Lisp_Object buffer,
                              buffer);
       w->start_at_line_beg = false;
       w->force_start = false;
+      /* Flush the base_line cache since it applied to another buffer.  */
+      w->base_line_number = 0;
     }
 
   wset_redisplay (w);
@@ -5378,7 +5380,14 @@ grow_mini_window (struct window *w, int delta)
       grow = call3 (Qwindow__resize_root_window_vertically,
                     root, make_fixnum (- delta), Qt);
 
-      if (FIXNUMP (grow) && window_resize_check (r, false))
+      if (FIXNUMP (grow)
+          /* It might be impossible to resize the window, in which case
+             calling resize_mini_window_apply will set off an infinite
+             loop where the redisplay cycle so forced returns to
+             resize_mini_window, making endless attempts to expand the
+             minibuffer window to this impossible size.  (bug#69140) */
+          && XFIXNUM (grow) != 0
+          && window_resize_check (r, false))
         resize_mini_window_apply (w, -XFIXNUM (grow));
     }
 }