[Emacs-diffs] /srv/bzr/emacs/trunk r105568: Fix last change for text terminals.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105568
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-08-25 20:16:39 +0300
message:
  Fix last change for text terminals.
  
   src/xdisp.c (try_cursor_movement): Don't advance `row' beyond the
   last row of the window.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-25 16:33:16 +0000
+++ b/src/ChangeLog     2011-08-25 17:16:39 +0000
@@ -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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-08-25 16:33:16 +0000
+++ b/src/xdisp.c       2011-08-25 17:16:39 +0000
@@ -14624,6 +14624,8 @@
                      rc = CURSOR_MOVEMENT_SUCCESS;
                      break;
                    }
+                 if (MATRIX_ROW_BOTTOM_Y (row) == last_y)
+                   break;
                  ++row;
                }
              while (((MATRIX_ROW_CONTINUATION_LINE_P (row)