comparison src/indent.c @ 21994:e244c4d9b0ca

(compute_motion): Undo both May 7 changes.

21993:3a95abf581d7

	      prev_hpos = 0;
	    }
	}

      /* Stop if past the target buffer position or screen position.  */
      if (pos > to
	  || vpos > tovpos
	  || vpos == tovpos && tohpos >= 0 && hpos > tohpos)
	{
	  /* Go back to the previous position.  */
	  pos = prev_pos;
	  pos_byte = prev_pos_byte;
	  hpos = prev_hpos;

	       set VPOS back to previous line */
	    vpos = vpos - 1;
	  break;
	}

      if (pos == ZV) /* We cannot go beyond ZV.  Stop here. */
	break;

      prev_hpos = hpos;
      prev_pos = pos;

21994:e244c4d9b0ca

	      prev_hpos = 0;
	    }
	}

      /* Stop if past the target buffer position or screen position.  */
      if (pos > to)
	{
	  /* Go back to the previous position.  */
	  pos = prev_pos;
	  pos_byte = prev_pos_byte;
	  hpos = prev_hpos;

	       set VPOS back to previous line */
	    vpos = vpos - 1;
	  break;
	}

      if (vpos > tovpos || vpos == tovpos && hpos >= tohpos)
	{
	  if (contin_hpos && prev_hpos == 0
	      && ((hpos > tohpos && contin_hpos == width)
		  || (wide_column_end_hpos > width)))
	    { /* Line breaks because we can't put the character at the
		 previous line any more.  It is not the multi-column
		 character continued in middle.  Go back to previous
		 buffer position, screen position, and set tab offset
		 to previous value.  It's the beginning of the
		 line.  */
	      pos = prev_pos;
	      pos_byte = prev_pos_byte;
	      hpos = prev_hpos;
	      tab_offset = prev_tab_offset;
	    }
	  break;
	}
      if (pos == ZV) /* We cannot go beyond ZV.  Stop here. */
	break;

      prev_hpos = hpos;
      prev_pos = pos;