procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(start_hourglass): Apply 2005-05-07 change for xfns.c.

Browse source 
(x_create_tip_frame) [GLYPH_DEBUG]: Uncomment debug code.
(Fx_create_frame, x_create_tip_frame) [USE_ATSUI]: Try
ATSUI-compatible 12pt Monaco font first.
This commit is contained in:
YAMAMOTO Mitsuharu 2005-10-01 11:09:09 +00:00
parent 9e4239ea12
commit aa27f1e712
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/macfns.c
View file

@ -2532,6 +2532,10 @@ This function is an internal primitive--use `make-frame' instead. */)
}
/* 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,6 +3344,10 @@ start_hourglass ()
EMACS_TIME delay;
int secs, usecs = 0;
/* Don't bother for ttys. */
if (NILP (Vwindow_system))
return;
cancel_hourglass ();
if (INTEGERP (Vhourglass_delay)
@ -3586,7 +3594,7 @@ x_create_tip_frame (dpyinfo, parms, text)
FRAME_FONTSET (f) = -1;
f->icon_name = Qnil;
#if 0 /* GLYPH_DEBUG TODO: image support. */
#if GLYPH_DEBUG
image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
dpyinfo_refcount = dpyinfo->reference_count;
#endif /* GLYPH_DEBUG */
@ -3630,6 +3638,10 @@ x_create_tip_frame (dpyinfo, parms, text)
}
/* 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. */