From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 7 Aug 2007 15:54:27 +0000 (+0000)
Subject: (move_it_by_lines): Remove incorrect optimization.
X-Git-Tag: emacs-pretest-22.1.90~1079
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a19a62aecb21887cbd910cd10662ad017cd84eb8;p=emacs.git

(move_it_by_lines): Remove incorrect optimization.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 1dd69e34590..a1c027b895e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7087,18 +7087,22 @@ move_it_by_lines (it, dvpos, need_y_p)
 {
   struct position pos;
 
-  if (!FRAME_WINDOW_P (it->f))
+  /* The commented-out optimization uses vmotion on terminals.  This
+     gives bad results, because elements like it->what, on which
+     callers such as pos_visible_p rely, aren't updated. */
+  /*  if (!FRAME_WINDOW_P (it->f))
     {
       struct text_pos textpos;
 
-      /* We can use vmotion on frames without proportional fonts.  */
       pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w);
       SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos);
       reseat (it, textpos, 1);
       it->vpos += pos.vpos;
       it->current_y += pos.vpos;
     }
-  else if (dvpos == 0)
+    else */
+
+  if (dvpos == 0)
     {
       /* DVPOS == 0 means move to the start of the screen line.  */
       move_it_vertically_backward (it, 0);