(compute_motion): Save vpos in prev_vpos, like hpos etc.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7caf4240561..48fc3e13114 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-02  Richard M. Stallman  <rms@gnu.org>
+
+        * indent.c (compute_motion): Save vpos in prev_vpos, like hpos etc.
+
 2004-03-02  Kenichi Handa  <handa@m17n.org>
 
         * doc.c (Fsubstitute_command_keys): Fix counding bytes.
diff --git a/src/indent.c b/src/indent.c
index 0d9fe9aaf9c..9a2ab0956e5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1197,7 +1197,6 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
     = (INTEGERP (current_buffer->selective_display)
        ? XINT (current_buffer->selective_display)
        : !NILP (current_buffer->selective_display) ? -1 : 0);
-  int prev_hpos = 0;
   int selective_rlen
     = (selective && dp && VECTORP (DISP_INVIS_VECTOR (dp))
        ? XVECTOR (DISP_INVIS_VECTOR (dp))->size : 0);
@@ -1225,6 +1224,8 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
   int wide_column_end_hpos = 0;
   int prev_pos;                 /* Previous buffer position.  */
   int prev_pos_byte;            /* Previous buffer position.  */
+  int prev_hpos = 0;
+  int prev_vpos = 0;
   int contin_hpos;              /* HPOS of last column of continued line.  */
   int prev_tab_offset;          /* Previous tab offset.  */
 
@@ -1273,6 +1274,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
                   pos = prev_pos;
                   pos_byte = prev_pos_byte;
                   hpos = prev_hpos;
+                  vpos = prev_vpos;
                   tab_offset = prev_tab_offset;
                 }
               break;
@@ -1382,6 +1384,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
                   if (pos >= next_boundary)
                     next_boundary = pos + 1;
                   prev_hpos = width;
+                  prev_vpos = vpos;
                   prev_tab_offset = tab_offset;
                 }
             }
@@ -1414,6 +1417,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
           pos = prev_pos;
           pos_byte = prev_pos_byte;
           hpos = prev_hpos;
+          vpos = prev_vpos;
           tab_offset = prev_tab_offset;
 
           /* NOTE on contin_hpos, hpos, and prev_hpos.
@@ -1434,10 +1438,6 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
               hpos = contin_hpos;
               vpos = vpos - 1;
             }
-          else if (c == '\n')
-            /* If previous character is NEWLINE,
-               set VPOS back to previous line */
-            vpos = vpos - 1;
           break;
         }
 
@@ -1455,6 +1455,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
               pos = prev_pos;
               pos_byte = prev_pos_byte;
               hpos = prev_hpos;
+              vpos = prev_vpos;
               tab_offset = prev_tab_offset;
             }
           break;
@@ -1463,6 +1464,7 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
         break;
 
       prev_hpos = hpos;
+      prev_vpos = vpos;
       prev_pos = pos;
       prev_pos_byte = pos_byte;
       wide_column_end_hpos = 0;