Merge from origin/emacs-25

7c1802f * doc/lispref/text.texi (Columns): Remove a nonexistent refer...
9034c50 * doc/man/emacsclient.1: Document +line:column option.
06495c9 Fix rare problems with echo-area display and multiple frames
f99b512 In M-%, avoid making buffer-local binding of text-property-de...

1 files changed, 9 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 290f69878da..11b20f99a27 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17046,7 +17046,16 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
             ignore_mouse_drag_p = true;
 #endif
         }
+      ptrdiff_t count1 = SPECPDL_INDEX ();
+      /* x_consider_frame_title calls select-frame, which calls
+         resize_mini_window, which could resize the mini-window and by
+         that undo the effect of this redisplay cycle wrt minibuffer
+         and echo-area display.  Binding inhibit-redisplay to t makes
+         the call to resize_mini_window a no-op, thus avoiding the
+         adverse side effects.  */
+      specbind (Qinhibit_redisplay, Qt);
       x_consider_frame_title (w->frame);
+      unbind_to (count1, Qnil);
 #endif
     }