From: Kenichi Handa <handa@m17n.org>
Date: Thu, 1 May 2008 06:24:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60bd985b633ec67ba1878ffdfee2ff648e1bdade;p=emacs.git

*** empty log message ***
---

diff --git a/src/font.c b/src/font.c
index cadf0bff723..a16af0caf80 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2010,10 +2010,15 @@ font_sort_entites (vec, prefer, frame, spec, best_only)
 	 thinks they are the same.  That happens, for instance, such a
 	 generic family name as "serif" is specified.  So, to ignore
 	 such a difference, for all properties specified in SPEC, set
-	 the corresponding properties in PREFER_PROP to nil.  */
-      for (i = FONT_FOUNDRY_INDEX; i <= FONT_SIZE_INDEX; i++)
+	 the corresponding properties in PREFER_PROP to nil.  The
+	 exception is the font size.  We prefer fonts of the exact
+	 size to fonts whose size difference is less than
+	 FONT_PIXEL_SIZE_QUANTUM.  */
+      for (i = FONT_FOUNDRY_INDEX; i < FONT_SIZE_INDEX; i++)
 	if (! NILP (AREF (spec, i)))
 	  prefer_prop[i] = Qnil;
+      if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
+	prefer_prop[FONT_SIZE_INDEX] = AREF (spec, FONT_SIZE_INDEX);
     }
 
   if (FLOATP (prefer_prop[FONT_SIZE_INDEX]))