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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/08/29 22:17:05

Index: indent.c
===================================================================
RCS file: /sources/emacs/emacs/src/indent.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -b -r1.183 -r1.184
--- indent.c    22 Feb 2006 20:29:41 -0000      1.183
+++ indent.c    29 Aug 2006 22:17:05 -0000      1.184
@@ -2074,7 +2074,7 @@
     {
       int it_start;
       int oselective;
-      int start_on_image_or_stretch_p;
+      int start_on_image_or_stretch_or_string_p;
 
       SET_TEXT_POS (pt, PT, PT_BYTE);
       start_display (&it, w, pt);
@@ -2086,8 +2086,9 @@
         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);
+      start_on_image_or_stretch_or_string_p = (it.method == GET_FROM_IMAGE
+                                              || it.method == GET_FROM_STRETCH
+                                              || it.method == GET_FROM_STRING);
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;
       /* Temporarily disable selective display so we don't move too far */
@@ -2098,10 +2099,10 @@
 
       /* 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.  */
+        It may also happen if it_start is on an image, stretch
+        glyph, or string -- in that case, don't go back.  */
       if (IT_CHARPOS (it) > it_start && XINT (lines) > 0
-         && !start_on_image_or_stretch_p)
+         && !start_on_image_or_stretch_or_string_p)
        move_it_by_lines (&it, -1, 0);
 
       it.vpos = 0;