[Emacs-diffs] Changes to emacs/src/indent.c

[Kim F . Storm]

Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.180 emacs/src/indent.c:1.181
*** emacs/src/indent.c:1.180    Sun Aug  7 12:33:17 2005
--- emacs/src/indent.c  Fri Dec  9 09:35:21 2005
***************
*** 2074,2080 ****
      {
        int it_start;
        int oselective;
!       int start_on_image_p;
  
        SET_TEXT_POS (pt, PT, PT_BYTE);
        start_display (&it, w, pt);
--- 2074,2080 ----
      {
        int it_start;
        int oselective;
!       int start_on_image_or_stretch_p;
  
        SET_TEXT_POS (pt, PT, PT_BYTE);
        start_display (&it, w, pt);
***************
*** 2086,2092 ****
         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 */
--- 2086,2093 ----
         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 */
***************
*** 2097,2105 ****
  
        /* 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;
--- 2098,2107 ----
  
        /* 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;