[Emacs-diffs] Changes to emacs/src/font.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/15 10:29:21

Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- font.c      14 May 2008 12:27:59 -0000      1.18
+++ font.c      15 May 2008 10:29:19 -0000      1.19
@@ -2780,6 +2780,14 @@
       double pt;
       for (i = 0; i < FONT_EXTRA_INDEX; i++)
        ASET (prefer, i, AREF (spec, i));
+      if (FONTP (attrs[LFACE_FONT_INDEX]))
+       {
+         Lisp_Object face_font = attrs[LFACE_FONT_INDEX];
+
+         for (i = 0; i < FONT_EXTRA_INDEX; i++)
+           if (NILP (AREF (prefer, i)))
+             ASET (prefer, i, AREF (face_font, i));
+       }
       if (NILP (AREF (prefer, FONT_FAMILY_INDEX)))
        font_parse_family_registry (attrs[LFACE_FAMILY_INDEX], Qnil, prefer);
       if (NILP (AREF (prefer, FONT_WEIGHT_INDEX)))