(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 86f72ecda45a42e1dbf294f8199b8dbf72f1548a..2ed9135264502f11e2b7c8827a8df2329a570a19 100644 (file)
--- 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 351d710ea40d7faafd063812062735f813f543e8..9d444c3ad6d15fb613720aded63810fb2529848b 100644 (file)
--- 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.  */