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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   06/11/20 02:47:15

Index: indent.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/indent.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- indent.c    26 Sep 2006 19:25:35 -0000      1.186
+++ indent.c    20 Nov 2006 02:47:15 -0000      1.187
@@ -2088,10 +2088,10 @@
       it_start = IT_CHARPOS (it);
 
       /* We expect the call to move_it_to, further down, to overshoot
-        if the starting point is on an image, stretch glyph, or Lisp
-        string.  We won't need to backtrack in this situation, except
-        for one corner case: when the Lisp string contains a
-        newline.  */
+        if the starting point is on an image, stretch glyph,
+        composition, or Lisp string.  We won't need to backtrack in
+        this situation, except for one corner case: when the Lisp
+        string contains a newline.  */
       if (it.method == GET_FROM_STRING)
        {
          const char *s = SDATA (it.string);
@@ -2104,7 +2104,8 @@
        }
       else
        it_overshoot_expected_p = (it.method == GET_FROM_IMAGE
-                                  || it.method == GET_FROM_STRETCH);
+                                  || it.method == GET_FROM_STRETCH
+                                  || it.method == GET_FROM_COMPOSITION);
 
       reseat_at_previous_visible_line_start (&it);
       it.current_x = it.hpos = 0;