1 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2840109ac1c..2df83082fbd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2014-12-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
+        composition_compute_stop_pos to the number of characters in the
+        string.  (Bug#19435)
+        <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code.
+
+        * composite.c (composition_compute_stop_pos): If no composition
+        was found in a string before ENDPOS, and ENDPOS is the string end,
+        no need to back up to a safe point.
+
+        * dispextern.h (struct it) <end_charpos>: Improve commentary.
+
 2014-12-24  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsimage.m (allocInitFromFile:): Initialize bmRep.