diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2000-09-08 09:50:33 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2000-09-08 09:50:33 +0000 |
| commit | bfe0ee88305f4e859c9070369e6721ab1e01d034 (patch) | |
| tree | c4f4eaaefe46829b423c5e662cdb35262ebd26c9 /src | |
| parent | bb934822bbe82a1f270c9f78ad26fc6e728d44c4 (diff) | |
| download | emacs-bfe0ee88305f4e859c9070369e6721ab1e01d034.tar.gz | |
(try_window_id): When trying to locate cursor in
unchanged rows at the top, handle the case that we can't find it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
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 @@ 2000-09-08 Gerd Moellmann <gerd@gnu.org> + * xdisp.c (try_window_id): When trying to locate cursor in + unchanged rows at the top, handle the case that we can't find it. + * xterm.c (x_draw_glyphs): Handle case START and END are out of bounds more carefully. 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) row = row_containing_pos (w, PT, MATRIX_FIRST_TEXT_ROW (w->current_matrix), last_unchanged_at_beg_row + 1); - xassert (row && row <= last_unchanged_at_beg_row); - set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); + if (row) + set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0); } /* Start from first_unchanged_at_end_row looking for PT. */ |