Fix bug #5943: C-e in a truncated line doesn't auto-hscroll.

 xdisp.c (set_cursor_from_row): Don't consider possibility of
 other rows with cursor unless they are different from this row and
 this row is part of a continued line.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3c0c56296891796d4227acb0578ff362ea02685..d1e22c730c74ef24ca8fccf9f3bcaf8ffacfc9d9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (set_cursor_from_row): Don't consider possibility of
+       other rows with cursor unless they are different from this row and
+       this row is part of a continued line.  (Bug#5943)
+
 2010-04-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * s/freebsd.h: Restore osreldate.h include.

diff --git a/src/xdisp.c b/src/xdisp.c
index 7523da8bd7bdd49bf209b9c3070300e244f7b5ba..c23c360832f6cf2c410120132d164f43e24c3290 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12925,7 +12925,12 @@ set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
      rows whose start and end charpos occlude point.  Only set
      w->cursor if we found a better approximation to the cursor
      position than we have from previously examined rows.  */
-  if (w->cursor.vpos >= 0
+  if (/* we already have a candidate row */
+      w->cursor.vpos >= 0
+      /* that candidate is not the row we are processing */
+      && MATRIX_ROW (matrix, w->cursor.vpos) != row
+      /* this row is part of a continued line */
+      && (row->continued_p || row->continuation_lines_width)
       /* Make sure cursor.vpos specifies a row whose start and end
         charpos occlude point.  This is because some callers of this
         function leave cursor.vpos at the row where the cursor was