Ignore a static composition that starts before the current checking position in redis...

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index cd98ec0..7193374 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2011-07-07  Kenichi Handa  <handa@m17n.org>
+
+       * composite.c (composition_compute_stop_pos): Ignore a static
+       composition starting before CHARPOS (Bug#8915).
+
+       * xdisp.c (handle_composition_prop): Likewise.
+
+2011-06-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * dispnew.c (scrolling_window): Before scrolling, turn off a
+       mouse-highlight in the window being scrolled.
+
+2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * nsmenu.m: Replace all uses of XVECTOR with ASIZE and AREF.  (Bug#8839)
+
+2011-06-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * emacs.c (main): Warn when starting a GTK emacs in daemon mode.
+
 2011-06-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * fringe.c (update_window_fringes): Don't update overlay arrow bitmap