aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorEli Zaretskii2012-04-23 19:22:23 +0300
committerEli Zaretskii2012-04-23 19:22:23 +0300
commitf0ee99a0d4aa7aa0f20e5ec673fb1936b5174eea (patch)
tree4807e88952485f29a30084123de672519cefc785 /src/window.c
parent775ab3953f56703789d1666bf16aa7c381edb835 (diff)
downloademacs-f0ee99a0d4aa7aa0f20e5ec673fb1936b5174eea.tar.gz
emacs-f0ee99a0d4aa7aa0f20e5ec673fb1936b5174eea.zip
Avoid assertion violation when scrolling minibuffer windows.
src/xdisp.c (pos_visible_p): If the window start position is beyond ZV, start the display from buffer beginning. Prevents assertion violation in init_iterator when the minibuffer window is scrolled via the scroll bar. src/window.c (window_scroll_pixel_based): Likewise.
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c
index af7968f9edf..f93f58f9b72 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4221,6 +4221,11 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
4221 void *itdata = NULL; 4221 void *itdata = NULL;
4222 4222
4223 SET_TEXT_POS_FROM_MARKER (start, w->start); 4223 SET_TEXT_POS_FROM_MARKER (start, w->start);
4224 /* Scrolling a minibuffer window via scroll bar when the echo area
4225 shows long text sometimes resets the minibuffer contents behind
4226 our backs. */
4227 if (CHARPOS (start) > ZV)
4228 SET_TEXT_POS (start, BEGV, BEGV_BYTE);
4224 4229
4225 /* If PT is not visible in WINDOW, move back one half of 4230 /* If PT is not visible in WINDOW, move back one half of
4226 the screen. Allow PT to be partially visible, otherwise 4231 the screen. Allow PT to be partially visible, otherwise