[Emacs-diffs] emacs/src xfaces.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/01/12 02:32:09

Modified files:
        src            : xfaces.c 

Log message:
        (Finternal_set_lisp_face_attribute): If setting the family, clear the
        font width index too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfaces.c?cvsroot=emacs&r1=1.427&r2=1.428

Patches:
Index: xfaces.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfaces.c,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -b -r1.427 -r1.428
--- xfaces.c    9 Jan 2009 14:11:38 -0000       1.427
+++ xfaces.c    12 Jan 2009 02:32:08 -0000      1.428
@@ -3341,6 +3341,12 @@
         the attribute is mandatory.  Also, clear the average
         width.  */
       font_clear_prop (XVECTOR (lface)->contents, prop_index);
+
+      /* If we are setting QCfamily, clear out FONT_WIDTH_INDEX as
+        well.  This avoids rejecting valid families that lack support
+        for a particular width.  */
+      if (prop_index == FONT_FAMILY_INDEX)
+       font_clear_prop (XVECTOR (lface)->contents, FONT_WIDTH_INDEX);
     }
 
   /* Changing a named face means that all realized faces depending on