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

[YAMAMOTO Mitsuharu]

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.67 emacs/src/macfns.c:1.68
*** emacs/src/macfns.c:1.67     Sun Sep 18 05:42:12 2005
--- emacs/src/macfns.c  Sat Oct  1 11:09:09 2005
***************
*** 2532,2537 ****
--- 2532,2541 ----
        }
  
      /* Try out a font which we hope has bold and italic variations.  */
+ #if USE_ATSUI
+     if (! STRINGP (font))
+       font = x_new_font (f, 
"-*-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1");
+ #endif
      if (! STRINGP (font))
        font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
      /* If those didn't work, look for something which will at least work.  */
***************
*** 3340,3345 ****
--- 3344,3353 ----
    EMACS_TIME delay;
    int secs, usecs = 0;
  
+   /* Don't bother for ttys.  */
+   if (NILP (Vwindow_system))
+     return;
+ 
    cancel_hourglass ();
  
    if (INTEGERP (Vhourglass_delay)
***************
*** 3586,3592 ****
    FRAME_FONTSET (f)  = -1;
    f->icon_name = Qnil;
  
! #if 0 /* GLYPH_DEBUG TODO: image support.  */
    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
    dpyinfo_refcount = dpyinfo->reference_count;
  #endif /* GLYPH_DEBUG */
--- 3594,3600 ----
    FRAME_FONTSET (f)  = -1;
    f->icon_name = Qnil;
  
! #if GLYPH_DEBUG
    image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
    dpyinfo_refcount = dpyinfo->reference_count;
  #endif /* GLYPH_DEBUG */
***************
*** 3630,3635 ****
--- 3638,3647 ----
        }
  
      /* Try out a font which we hope has bold and italic variations.  */
+ #if USE_ATSUI
+     if (! STRINGP (font))
+       font = x_new_font (f, 
"-*-monaco-medium-r-normal--12-*-*-*-*-*-iso10646-1");
+ #endif
      if (! STRINGP (font))
        font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
      /* If those didn't work, look for something which will at least work.  */