summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2013-11-27 08:44:48 +0100
committerMartin Rudalics <rudalics@gmx.at>2013-11-27 08:44:48 +0100
commit72fdd47303c46def1d91f202c177b7ff9a489441 (patch)
treef6e5ae78bb789e1d29084bc0e85b1b9292da129d
parent0717822943efa5013dffa1494f528e23d102ae72 (diff)
downloademacs-72fdd47303c46def1d91f202c177b7ff9a489441.tar.gz
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).
-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 @@
+2013-11-27 Martin Rudalics <rudalics@gmx.at>
+
+ * window.c (Fset_window_start, window_resize_apply)
+ (window_scroll): Reset window_end_valid (Bug#15957).
+
2013-11-27 Glenn Morris <rgm@gnu.org>
* 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. */)
if (NILP (noforce))
w->force_start = 1;
w->update_mode_line = 1;
+ /* Bug#15957. */
+ w->window_end_valid = 0;
if (w != XWINDOW (selected_window))
/* Enforce full redisplay. FIXME: make it more selective. */
windows_or_buffers_changed = 26;
@@ -3615,6 +3617,9 @@ window_resize_apply (struct window *w, bool horflag)
c = NILP (c->next) ? 0 : XWINDOW (c->next);
}
}
+ else
+ /* Bug#15957. */
+ w->window_end_valid = 0;
}
@@ -4286,6 +4291,8 @@ window_scroll (Lisp_Object window, EMACS_INT n, bool whole, int noerror)
else
window_scroll_line_based (window, n, whole, noerror);
+ /* Bug#15957. */
+ XWINDOW (window)->window_end_valid = 0;
immediate_quit = 0;
}