Fix last change for text terminals.

 src/xdisp.c (try_cursor_movement): Don't advance `row' beyond the
 last row of the window.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1176c9254eaaea56844f27b8bc485e0d29a4dbe6..149753a674962430bbfb772ad4314550f69392ac 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,7 +8,8 @@
        `(space ...)', and specifies display in the text area, return 2
        rather than 1.
        (try_cursor_movement): Check for the need to scroll more
-       accurately, and prefer exact match for point under bidi.
+       accurately, and prefer exact match for point under bidi.  Don't
+       advance `row' beyond the last row of the window.
 
        * dispextern.h (struct bidi_it): Rename the disp_prop_p member
        into disp_prop; all users changed.

diff --git a/src/xdisp.c b/src/xdisp.c
index 55bbb7cf62ed889aaae1f95b3c442db48183cb03..beb161f4ce4ac4b41bf28f801c90313e4db0f171 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14624,6 +14624,8 @@ try_cursor_movement (Lisp_Object window, struct text_pos startp, int *scroll_ste
                      rc = CURSOR_MOVEMENT_SUCCESS;
                      break;
                    }
+                 if (MATRIX_ROW_BOTTOM_Y (row) == last_y)
+                   break;
                  ++row;
                }
              while (((MATRIX_ROW_CONTINUATION_LINE_P (row)