[Emacs-diffs] Changes to emacs/src/xfaces.c

[Kenichi Handa]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.263 emacs/src/xfaces.c:1.264
*** emacs/src/xfaces.c:1.263    Thu Sep 26 04:03:52 2002
--- emacs/src/xfaces.c  Thu Sep 26 20:43:40 2002
***************
*** 6343,6349 ****
    Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX];
    Lisp_Object try_family;
  
!   try_family = prefer_face_family ? face_family : family;
  
    if (STRINGP (try_family))
      nfonts = try_alternative_families (f, try_family, registry, fonts);
--- 6343,6349 ----
    Lisp_Object face_family = attrs[LFACE_FAMILY_INDEX];
    Lisp_Object try_family;
  
!   try_family = (prefer_face_family || NILP (family)) ? face_family : family;
  
    if (STRINGP (try_family))
      nfonts = try_alternative_families (f, try_family, registry, fonts);
***************
*** 6359,6365 ****
      nfonts = try_alternative_families (f, try_family, Qnil, fonts);
  #endif
  
!   if (! prefer_face_family)
      family = face_family;
  
    if (nfonts == 0 && STRINGP (family))
--- 6359,6365 ----
      nfonts = try_alternative_families (f, try_family, Qnil, fonts);
  #endif
  
!   if (EQ (try_family, family))
      family = face_family;
  
    if (nfonts == 0 && STRINGP (family))