diff src/indent.c @ 90667:dbe3f29e61d6

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 505-522) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: etc/TUTORIAL.cn: Updated. - Merge from erc--emacs--22 * gnus--rel--5.10 (patch 164-167) - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-137

--- a/src/indent.c	Tue Nov 21 01:10:47 2006 +0000
+++ b/src/indent.c	Tue Nov 21 08:56:38 2006 +0000
@@ -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;