[Emacs-diffs] emacs/src font.c

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/04/13 12:33:02

Modified files:
        src            : font.c 

Log message:
        (font_delete_unmatched): Preserve the order of list
        elements.
        (font_select_entity): Suppress the code to optimize for the same
        kind of fonts.
        (font_load_for_lface): Get a font that supports at least ASCII
        characters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.120&r2=1.121

Patches:
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- font.c      9 Apr 2009 02:40:39 -0000       1.120
+++ font.c      13 Apr 2009 12:33:02 -0000      1.121
@@ -2752,7 +2752,7 @@
       if (prop < FONT_SPEC_MAX)
        val = Fcons (entity, val);
     }
-  return val;
+  return Fnreverse (val);
 }
 
 
@@ -3223,6 +3223,11 @@
       int j;
 
       font_entity = AREF (entities, i);
+#if 0
+      /* The following code is intended to avoid checking of
+        font_has_char repeatedly for bitmap fonts that differs only
+        in pixelsize.  But, it doesn't work well if fontconfig is
+        configured to find BDF/PFC fonts.  */
       if (i > 0)
        {
          for (j = FONT_FOUNDRY_INDEX; j <= FONT_REGISTRY_INDEX; j++)
@@ -3233,6 +3238,7 @@
        }
       for (j = FONT_FOUNDRY_INDEX; j <= FONT_REGISTRY_INDEX; j++)
        props[j] = AREF (font_entity, j);
+#endif
       result = font_has_char (f, font_entity, c);
       if (result > 0)
        return font_entity;
@@ -3455,7 +3461,8 @@
 {
   Lisp_Object entity;
 
-  entity = font_find_for_lface (f, attrs, spec, -1);
+  /* We assume that a font that supports 'A' supports ASCII chars.  */
+  entity = font_find_for_lface (f, attrs, spec, 'A');
   if (NILP (entity))
     {
       /* No font is listed for SPEC, but each font-backend may have