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

[YAMAMOTO Mitsuharu]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.330 emacs/src/xfaces.c:1.331
*** emacs/src/xfaces.c:1.330    Mon Jul 11 14:28:21 2005
--- emacs/src/xfaces.c  Wed Jul 13 09:13:19 2005
***************
*** 6745,6758 ****
      nfonts = try_alternative_families (f, try_family, registry, fonts);
  
  #ifdef MAC_OS
!   /* When realizing the default face and a font spec does not matched
!      exactly, Emacs looks for ones with the same registry as the
!      default font.  On the Mac, this is mac-roman, which does not work
!      if the family is -etl-fixed, e.g.  The following widens the
!      choices and fixes that problem.  */
!   if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry)
!       && xstricmp (SDATA (registry), "mac-roman") == 0)
!     nfonts = try_alternative_families (f, try_family, Qnil, fonts);
  #endif
  
    if (EQ (try_family, family))
--- 6745,6765 ----
      nfonts = try_alternative_families (f, try_family, registry, fonts);
  
  #ifdef MAC_OS
!   if (nfonts == 0 && STRINGP (try_family) && STRINGP (registry))
!     if (xstricmp (SDATA (registry), "mac-roman") == 0)
!       /* When realizing the default face and a font spec does not
!        matched exactly, Emacs looks for ones with the same registry
!        as the default font.  On the Mac, this is mac-roman, which
!        does not work if the family is -etl-fixed, e.g.  The
!        following widens the choices and fixes that problem.  */
!       nfonts = try_alternative_families (f, try_family, Qnil, fonts);
!     else if (SBYTES (try_family) > 0
!            && SREF (try_family, SBYTES (try_family) - 1) != '*')
!       /* Some Central European/Cyrillic font family names have the
!        Roman counterpart name as their prefix.  */
!       nfonts = try_alternative_families (f, concat2 (try_family,
!                                                    build_string ("*")),
!                                        registry, fonts);
  #endif
  
    if (EQ (try_family, family))