comparison src/indent.c @ 83408:39bb10ce301a

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-667 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-669 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-670 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-157 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-158 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-159 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-160 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-163 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-165 Update from CVS: texi/message.texi: Fix default values. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-168 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-448

83407:37d0562504bf

    }
  else
    {
      int it_start;
      int oselective;
      int start_on_image_p;

      SET_TEXT_POS (pt, PT, PT_BYTE);
      start_display (&it, w, pt);

      /* Scan from the start of the line containing PT.  If we don't

	 really at some x > 0.  The effect is, in continuation lines, that
	 we end up with the iterator placed at where it thinks X is 0,
	 while the end position is really at some X > 0, the same X that
	 PT had.  */
      it_start = IT_CHARPOS (it);
      start_on_image_p = (it.method == GET_FROM_IMAGE);
      reseat_at_previous_visible_line_start (&it);
      it.current_x = it.hpos = 0;
      /* Temporarily disable selective display so we don't move too far */
      oselective = it.selective;
      it.selective = 0;
      move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
      it.selective = oselective;

      /* Move back if we got too far.  This may happen if
	 truncate-lines is on and PT is beyond right margin.
	 It may also happen if it_start is on an image --
	 in that case, don't go back.  */
      if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 && !start_on_image_p)
	move_it_by_lines (&it, -1, 0);

      it.vpos = 0;
      /* Do this even if LINES is 0, so that we move back
	 to the beginning of the current line as we ought.  */

83408:39bb10ce301a

    }
  else
    {
      int it_start;
      int oselective;
      int start_on_image_or_stretch_p;

      SET_TEXT_POS (pt, PT, PT_BYTE);
      start_display (&it, w, pt);

      /* Scan from the start of the line containing PT.  If we don't

	 really at some x > 0.  The effect is, in continuation lines, that
	 we end up with the iterator placed at where it thinks X is 0,
	 while the end position is really at some X > 0, the same X that
	 PT had.  */
      it_start = IT_CHARPOS (it);
      start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE
				     || it.method == GET_FROM_STRETCH);
      reseat_at_previous_visible_line_start (&it);
      it.current_x = it.hpos = 0;
      /* Temporarily disable selective display so we don't move too far */
      oselective = it.selective;
      it.selective = 0;
      move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
      it.selective = oselective;

      /* Move back if we got too far.  This may happen if
	 truncate-lines is on and PT is beyond right margin.
	 It may also happen if it_start is on an image or a stretch
	 glyph -- in that case, don't go back.  */
      if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
	  && !start_on_image_or_stretch_p)
	move_it_by_lines (&it, -1, 0);

      it.vpos = 0;
      /* Do this even if LINES is 0, so that we move back
	 to the beginning of the current line as we ought.  */