# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1126557509 0
# Node ID dba2088fc82f35f4da397e7326264a58f5e04d6e
# Parent  ea119ac3951f4bdc51c9a5269a9533478320dbf6
*** empty log message ***

diff -r ea119ac3951f -r dba2088fc82f src/ChangeLog
--- a/src/ChangeLog	Mon Sep 12 15:47:31 2005 +0000
+++ b/src/ChangeLog	Mon Sep 12 20:38:29 2005 +0000
@@ -1,5 +1,8 @@
 2005-09-12  Kim F. Storm  <storm@cua.dk>
 
+	* composite.c (compose_chars_in_text): Fix setup of `pend'.
+	Unconditionally reload `ptr' and `pend' after eval.
+
 	* xdisp.c (message3): Pass copy of lisp string to message_dolog.
 
 	* print.c (print_error_message): Pass copy of caller name to