1 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 039c225c1f6..4df4455e862 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2011-08-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * ftfont.c (ftfont_pattern_entity): Copy the extras argument to
+        the font entity extracted from the cache (Bug#8109).
+
+2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * composite.c (autocmp_chars): Don't reset point.  That is done by
+        restore_point_unwind (Bug#5984).
+
+2011-08-07  Juri Linkov  <juri@jurta.org>
+
+        * editfns.c (Fformat_time_string): Doc fix, add tag `usage:'
+        to show the arg `TIME' instead of `TIMEVAL'.
+
 2011-08-06  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (set_cursor_from_row): Fix cursor positioning when a