aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-08 09:50:33 +0000
committerGerd Moellmann2000-09-08 09:50:33 +0000
commitbfe0ee88305f4e859c9070369e6721ab1e01d034 (patch)
treec4f4eaaefe46829b423c5e662cdb35262ebd26c9
parentbb934822bbe82a1f270c9f78ad26fc6e728d44c4 (diff)
downloademacs-bfe0ee88305f4e859c9070369e6721ab1e01d034.tar.gz
emacs-bfe0ee88305f4e859c9070369e6721ab1e01d034.zip
(try_window_id): When trying to locate cursor in
unchanged rows at the top, handle the case that we can't find it.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 86f72ecda45..2ed91352645 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12000-09-08 Gerd Moellmann <gerd@gnu.org> 12000-09-08 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (try_window_id): When trying to locate cursor in
4 unchanged rows at the top, handle the case that we can't find it.
5
3 * xterm.c (x_draw_glyphs): Handle case START and END are out 6 * xterm.c (x_draw_glyphs): Handle case START and END are out
4 of bounds more carefully. 7 of bounds more carefully.
5 8
diff --git a/src/xdisp.c b/src/xdisp.c
index 351d710ea40..9d444c3ad6d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10601,8 +10601,8 @@ try_window_id (w)
10601 row = row_containing_pos (w, PT, 10601 row = row_containing_pos (w, PT,
10602 MATRIX_FIRST_TEXT_ROW (w->current_matrix), 10602 MATRIX_FIRST_TEXT_ROW (w->current_matrix),
10603 last_unchanged_at_beg_row + 1); 10603 last_unchanged_at_beg_row + 1);
10604 xassert (row && row <= last_unchanged_at_beg_row); 10604 if (row)
10605 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); 10605 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
10606 } 10606 }
10607 10607
10608 /* Start from first_unchanged_at_end_row looking for PT. */ 10608 /* Start from first_unchanged_at_end_row looking for PT. */