aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2019-07-11 16:03:33 +0300
committerEli Zaretskii2019-07-11 16:03:33 +0300
commit2581513abea46d41ee97ea55b22803e78efc1459 (patch)
tree6c5d3f0d4dbbb51727f4975d0b5285a4aeb7cd34
parent40cd6278ba965f3a9fcdddc568eb9ee7c69cf899 (diff)
downloademacs-2581513abea46d41ee97ea55b22803e78efc1459.tar.gz
emacs-2581513abea46d41ee97ea55b22803e78efc1459.zip
Avoid assertion violations when resize-mini-windows is nil
* 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)
-rw-r--r--src/xdisp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 2711e54382d..7f0d577cebc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11392,17 +11392,17 @@ resize_mini_window (struct window *w, bool exact_p)
11392 if (!NILP (Vinhibit_redisplay)) 11392 if (!NILP (Vinhibit_redisplay))
11393 return false; 11393 return false;
11394 11394
11395 /* By default, start display at the beginning. */
11396 set_marker_both (w->start, w->contents,
11397 BUF_BEGV (XBUFFER (w->contents)),
11398 BUF_BEGV_BYTE (XBUFFER (w->contents)));
11399
11395 /* Nil means don't try to resize. */ 11400 /* Nil means don't try to resize. */
11396 if ((NILP (Vresize_mini_windows) 11401 if ((NILP (Vresize_mini_windows)
11397 && (NILP (resize_mini_frames) || !FRAME_MINIBUF_ONLY_P (f))) 11402 && (NILP (resize_mini_frames) || !FRAME_MINIBUF_ONLY_P (f)))
11398 || (FRAME_X_P (f) && FRAME_OUTPUT_DATA (f) == NULL)) 11403 || (FRAME_X_P (f) && FRAME_OUTPUT_DATA (f) == NULL))
11399 return false; 11404 return false;
11400 11405
11401 /* By default, start display at the beginning. */
11402 set_marker_both (w->start, w->contents,
11403 BUF_BEGV (XBUFFER (w->contents)),
11404 BUF_BEGV_BYTE (XBUFFER (w->contents)));
11405
11406 if (FRAME_MINIBUF_ONLY_P (f)) 11406 if (FRAME_MINIBUF_ONLY_P (f))
11407 { 11407 {
11408 if (!NILP (resize_mini_frames)) 11408 if (!NILP (resize_mini_frames))