summaryrefslogtreecommitdiff
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-19 13:44:07 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-10-19 13:44:07 +0200
commitca3fa30248b923c17c021c0fcdb945271d14e8c2 (patch)
tree8283b1da72c771a21410f5fe621d3a299fe66b53 /src/ChangeLog
parent3224b54d5cc5964af5e6509579fd942eae04f1d1 (diff)
parentbca0f839a56a1edd8562ada5962b809323f39efc (diff)
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7046d13262f..c9d0e80c12f 100644
--- 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):