From: Gerd Moellmann Date: Fri, 8 Sep 2000 09:50:33 +0000 (+0000) Subject: (try_window_id): When trying to locate cursor in X-Git-Tag: emacs-pretest-21.0.90~1705 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfe0ee88305f4e859c9070369e6721ab1e01d034;p=emacs.git (try_window_id): When trying to locate cursor in unchanged rows at the top, handle the case that we can't find it. --- 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 + * 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. */