aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2005-04-06 02:24:23 +0000
committerYAMAMOTO Mitsuharu2005-04-06 02:24:23 +0000
commit34958350635ec3fd8951e914673657e910e3f6ea (patch)
tree381de3a5cce454fcce54146845616b372821f8b3 /src
parentd440d0de14dbe5fee3e0d7898e365ae60ac24398 (diff)
downloademacs-34958350635ec3fd8951e914673657e910e3f6ea.tar.gz
emacs-34958350635ec3fd8951e914673657e910e3f6ea.zip
(Fx_create_frame, x_create_tip_frame): Add "fontset-mac" to fallback
font/fontsets.
Diffstat (limited to 'src')
-rw-r--r--src/macfns.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/macfns.c b/src/macfns.c
index 75994cab150..357f993b0f9 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2632,6 +2632,8 @@ This function is an internal primitive--use `make-frame' instead. */)
2632 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 2632 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
2633 /* If those didn't work, look for something which will at least work. */ 2633 /* If those didn't work, look for something which will at least work. */
2634 if (! STRINGP (font)) 2634 if (! STRINGP (font))
2635 font = x_new_fontset (f, "fontset-mac");
2636 if (! STRINGP (font))
2635 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); 2637 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
2636 if (! STRINGP (font)) 2638 if (! STRINGP (font))
2637 font = x_new_font (f, "-*-courier-*-10-*-mac-roman"); 2639 font = x_new_font (f, "-*-courier-*-10-*-mac-roman");
@@ -3732,6 +3734,8 @@ x_create_tip_frame (dpyinfo, parms, text)
3732 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); 3734 font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
3733 /* If those didn't work, look for something which will at least work. */ 3735 /* If those didn't work, look for something which will at least work. */
3734 if (! STRINGP (font)) 3736 if (! STRINGP (font))
3737 font = x_new_fontset (f, "fontset-mac");
3738 if (! STRINGP (font))
3735 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); 3739 font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
3736 if (! STRINGP (font)) 3740 if (! STRINGP (font))
3737 font = x_new_font (f, "-*-courier-*-10-*-mac-roman"); 3741 font = x_new_font (f, "-*-courier-*-10-*-mac-roman");