From: Kim F. Storm <storm@cua.dk>
Date: Tue, 27 Jun 2006 11:21:31 +0000 (+0000)
Subject: (handle_composition_prop): Set stop_charpos before push_it.
X-Git-Tag: emacs-pretest-22.0.90~1824
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1b328d37a26503493b67bc1a5f65d77420e202f;p=emacs.git

(handle_composition_prop): Set stop_charpos before push_it.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 0c46545a2ac..55ee9fc20e7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4488,7 +4488,9 @@ handle_composition_prop (it)
 	      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 @@ handle_composition_prop (it)
 	  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;
 	}
     }