Merge changes from emacs-23 branch.

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 7046d13..c9d0e80 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-19  Ken Brown  <kbrown@cornell.edu>
+
+       * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).
+
+2010-10-19  Kenichi Handa  <handa@m17n.org>
+
+       Fix incorrect font metrics when the same font is opened with
+       different pixelsizes.
+
+       * xftfont.c: Include composite.h.
+       (xftfont_shape): New function.
+       (syms_of_xftfont): Set xftfont_driver.shape.
+
 2010-10-18  Julien Danjou  <julien@danjou.info>
 
        * frame.c (Fframe_pointer_visible_p):