[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100496: Fix font size handling.

[Kenichi Handa]

------------------------------------------------------------
revno: 100496 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: emacs-23
timestamp: Tue 2011-02-22 10:58:51 +0900
message:
  Fix font size handling.
modified:
  src/ChangeLog
  src/font.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-19 17:34:50 +0000
+++ b/src/ChangeLog     2011-02-22 01:58:03 +0000
@@ -1,3 +1,9 @@
+2011-02-22  Kenichi Handa  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.

=== modified file 'src/font.c'
--- a/src/font.c        2011-01-27 00:45:30 +0000
+++ b/src/font.c        2011-02-22 01:58:03 +0000
@@ -3042,7 +3042,7 @@
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   int min_width, height;
-  int scaled_pixel_size;
+  int scaled_pixel_size = pixel_size;
 
   font_assert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
@@ -3422,7 +3422,7 @@
   XSETFRAME (frame, f);
   size = AREF (spec, FONT_SIZE_INDEX);
   pixel_size = font_pixel_size (f, spec);
-  if (pixel_size == 0)
+  if (pixel_size == 0 && INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);