# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1151407291 0
# Node ID db787aec94218fadbfd873af7a2cabe374222e17
# Parent  c7bb40f0c3d592253835ea010d9b1c3776cbbfc6
(handle_composition_prop): Set stop_charpos before push_it.

diff -r c7bb40f0c3d5 -r db787aec9421 src/xdisp.c
--- a/src/xdisp.c	Tue Jun 27 11:21:20 2006 +0000
+++ b/src/xdisp.c	Tue Jun 27 11:21:31 2006 +0000
@@ -4488,7 +4488,9 @@
 	      return HANDLED_RECOMPUTE_PROPS;
 	    }
 
+	  it->stop_charpos = end;
 	  push_it (it);
+
 	  it->method = GET_FROM_COMPOSITION;
 	  it->cmp_id = id;
 	  it->cmp_len = COMPOSITION_LENGTH (prop);
@@ -4498,7 +4500,6 @@
 	  it->len = (STRINGP (it->string)
 		     ? string_char_to_byte (it->string, end)
 		     : CHAR_TO_BYTE (end)) - pos_byte;
-	  it->stop_charpos = end;
 	  handled = HANDLED_RETURN;
 	}
     }