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

[Kenichi Handa]

Index: emacs/src/fontset.c
diff -c emacs/src/fontset.c:1.92 emacs/src/fontset.c:1.93
*** emacs/src/fontset.c:1.92    Mon Nov  8 00:38:26 2004
--- emacs/src/fontset.c Tue Mar  8 08:45:48 2005
***************
*** 764,769 ****
--- 764,786 ----
  #pragma optimize("", on)
  #endif
  
+ /* Set the ASCII font of the default fontset to FONTNAME if that is
+    not yet set.  */
+ void
+ set_default_ascii_font (fontname)
+      Lisp_Object fontname;
+ {
+   if (! CONSP (FONTSET_ASCII (Vdefault_fontset)))
+     {
+       int id = fs_query_fontset (fontname, 2);
+ 
+       if (id >= 0)
+       fontname = XCDR (FONTSET_ASCII (FONTSET_FROM_ID (id)));
+       FONTSET_ASCII (Vdefault_fontset)
+       = Fcons (make_number (0), fontname);
+     }
+ }
+ 
  
  /* Cache data used by fontset_pattern_regexp.  The car part is a
     pattern string containing at least one wild card, the cdr part is
***************
*** 1627,1645 ****
    FONTSET_ID (Vdefault_fontset) = make_number (0);
    FONTSET_NAME (Vdefault_fontset)
      = build_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default");
- #if defined (MAC_OS)
-   FONTSET_ASCII (Vdefault_fontset)
-     = Fcons (make_number (0),
-            build_string 
("-apple-monaco-medium-r-*--*-120-*-*-*-*-mac-roman"));
- #elif defined (WINDOWSNT)
-   FONTSET_ASCII (Vdefault_fontset)
-     = Fcons (make_number (0),
-            build_string ("-*-courier 
new-normal-r-*-*-*-100-*-*-*-*-iso8859-1"));
- #else
-   FONTSET_ASCII (Vdefault_fontset)
-     = Fcons (make_number (0),
-            build_string 
("-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"));
- #endif
    AREF (Vfontset_table, 0) = Vdefault_fontset;
    next_fontset_id = 1;
  
--- 1644,1649 ----