Index: src/indent.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/indent.c,v
retrieving revision 1.160
diff -c -r1.160 indent.c
*** src/indent.c	5 Apr 2004 21:41:08 -0000	1.160
--- src/indent.c	30 Apr 2004 11:27:23 -0000
***************
*** 1197,1202 ****
--- 1197,1203 ----
      = (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);
***************
*** 1224,1231 ****
    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.  */
  
--- 1225,1230 ----
***************
*** 1274,1280 ****
  		  pos = prev_pos;
  		  pos_byte = prev_pos_byte;
  		  hpos = prev_hpos;
- 		  vpos = prev_vpos;
  		  tab_offset = prev_tab_offset;
  		}
  	      break;
--- 1273,1278 ----
***************
*** 1384,1390 ****
  		  if (pos >= next_boundary)
  		    next_boundary = pos + 1;
  		  prev_hpos = width;
- 		  prev_vpos = vpos;
  		  prev_tab_offset = tab_offset;
  		}
  	    }
--- 1382,1387 ----
***************
*** 1417,1423 ****
  	  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.
--- 1414,1419 ----
***************
*** 1438,1443 ****
--- 1434,1443 ----
  	      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,1461 ****
  	      pos = prev_pos;
  	      pos_byte = prev_pos_byte;
  	      hpos = prev_hpos;
- 	      vpos = prev_vpos;
  	      tab_offset = prev_tab_offset;
  	    }
  	  break;
--- 1455,1460 ----
***************
*** 1464,1470 ****
  	break;
  
        prev_hpos = hpos;
-       prev_vpos = vpos;
        prev_pos = pos;
        prev_pos_byte = pos_byte;
        wide_column_end_hpos = 0;
--- 1463,1468 ----