[Emacs-diffs] /srv/bzr/emacs/trunk r99921: Fix bug #5943: C-e in a truncated line doesn't auto-hscroll.

[Eli Zaretskii]

------------------------------------------------------------
revno: 99921
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-16 23:37:59 +0300
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-16 17:22:12 +0000
+++ b/src/ChangeLog     2010-04-16 20:37:59 +0000
@@ -1,3 +1,9 @@
+2010-04-16  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * s/freebsd.h: Restore osreldate.h include.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-04-15 18:24:00 +0000
+++ b/src/xdisp.c       2010-04-16 20:37:59 +0000
@@ -12925,7 +12925,12 @@
      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