merge emacs-23

diff --combined src/ChangeLog
index 26da194,f9c1581..addaab3
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,13 +1,19 @@@
+ 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.
  
 +2011-02-17  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-13  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (redisplay_internal): Resynchronize `w' if the selected