aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2013-11-27 08:44:48 +0100
committerMartin Rudalics2013-11-27 08:44:48 +0100
commit72fdd47303c46def1d91f202c177b7ff9a489441 (patch)
treef6e5ae78bb789e1d29084bc0e85b1b9292da129d /src
parent0717822943efa5013dffa1494f528e23d102ae72 (diff)
downloademacs-72fdd47303c46def1d91f202c177b7ff9a489441.tar.gz
emacs-72fdd47303c46def1d91f202c177b7ff9a489441.zip
Reset window_end_valid after some window changes (Bug#15957).
* window.c (Fset_window_start, window_resize_apply) (window_scroll): Reset window_end_valid (Bug#15957).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 35f0926415c..7b518fdc239 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-11-27 Martin Rudalics <rudalics@gmx.at>
2
3 * window.c (Fset_window_start, window_resize_apply)
4 (window_scroll): Reset window_end_valid (Bug#15957).
5
12013-11-27 Glenn Morris <rgm@gnu.org> 62013-11-27 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (leimdir): Now in lisp source directory. 8 * Makefile.in (leimdir): Now in lisp source directory.
diff --git a/src/window.c b/src/window.c
index bc0adaf459f..f01ba153c70 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1574,6 +1574,8 @@ overriding motion of point in order to display at this exact start. */)
1574 if (NILP (noforce)) 1574 if (NILP (noforce))
1575 w->force_start = 1; 1575 w->force_start = 1;
1576 w->update_mode_line = 1; 1576 w->update_mode_line = 1;
1577 /* Bug#15957. */
1578 w->window_end_valid = 0;
1577 if (w != XWINDOW (selected_window)) 1579 if (w != XWINDOW (selected_window))
1578 /* Enforce full redisplay. FIXME: make it more selective. */ 1580 /* Enforce full redisplay. FIXME: make it more selective. */
1579 windows_or_buffers_changed = 26; 1581 windows_or_buffers_changed = 26;
@@ -3615,6 +3617,9 @@ window_resize_apply (struct window *w, bool horflag)
3615 c = NILP (c->next) ? 0 : XWINDOW (c->next); 3617 c = NILP (c->next) ? 0 : XWINDOW (c->next);
3616 } 3618 }
3617 } 3619 }
3620 else
3621 /* Bug#15957. */
3622 w->window_end_valid = 0;
3618} 3623}
3619 3624
3620 3625
@@ -4286,6 +4291,8 @@ window_scroll (Lisp_Object window, EMACS_INT n, bool whole, int noerror)
4286 else 4291 else
4287 window_scroll_line_based (window, n, whole, noerror); 4292 window_scroll_line_based (window, n, whole, noerror);
4288 4293
4294 /* Bug#15957. */
4295 XWINDOW (window)->window_end_valid = 0;
4289 immediate_quit = 0; 4296 immediate_quit = 0;
4290} 4297}
4291 4298