merge emacs-23

[bpt/emacs.git] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 26da194..addaab3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-22  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
+       integer.
+
 2011-02-19  Chong Yidong  <cyd@stupidchicken.com>
 
        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.