[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/09/30 16:54:43

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1258
retrieving revision 1.1259
diff -u -b -r1.1258 -r1.1259
--- xdisp.c     20 Sep 2008 21:44:34 -0000      1.1258
+++ xdisp.c     30 Sep 2008 16:54:41 -0000      1.1259
@@ -7258,9 +7258,10 @@
            {
              it->continuation_lines_width += it->last_visible_x;
              /* When moving by vpos, ensure that the iterator really
-                advances to the next line (bug#847).  Fixme: do we
-                need to do this in other circumstances?  */
-             if ((op & MOVE_TO_VPOS)
+                advances to the next line (bug#847, bug#969).  Fixme:
+                do we need to do this in other circumstances?  */
+             if (it->current_x != it->last_visible_x
+                 && (op & MOVE_TO_VPOS)
                  && !(op & (MOVE_TO_X | MOVE_TO_POS)))
                set_iterator_to_next (it, 0);
            }