andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid assertion violations when resize-mini-windows is nil

Browse source 
* src/xdisp.c (resize_mini_window): Always reset the
mini-window's start point to the beginning of the buffer, even
if resizing is not needed.  This avoids assertion violations
when resize-mini-windows is nil.  (Bug#36595)
This commit is contained in:
Eli Zaretskii 2019-07-11 16:03:33 +03:00
parent 40cd6278ba
commit 2581513abe
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xdisp.c
View file

@ -11392,17 +11392,17 @@ resize_mini_window (struct window *w, bool exact_p)
if (!NILP (Vinhibit_redisplay))
return false;
/* By default, start display at the beginning. */
set_marker_both (w->start, w->contents,
BUF_BEGV (XBUFFER (w->contents)),
BUF_BEGV_BYTE (XBUFFER (w->contents)));
/* Nil means don't try to resize. */
if ((NILP (Vresize_mini_windows)
&& (NILP (resize_mini_frames) || !FRAME_MINIBUF_ONLY_P (f)))
|| (FRAME_X_P (f) && FRAME_OUTPUT_DATA (f) == NULL))
return false;
/* By default, start display at the beginning. */
set_marker_both (w->start, w->contents,
BUF_BEGV (XBUFFER (w->contents)),
BUF_BEGV_BYTE (XBUFFER (w->contents)));
if (FRAME_MINIBUF_ONLY_P (f))
{
if (!NILP (resize_mini_frames))