(Fx_create_frame, x_create_tip_frame): Add "fontset-mac" to fallback

font/fontsets.

diff --git a/src/macfns.c b/src/macfns.c
index 75994cab1504143caac8674646a7b6a37916094b..357f993b0f9774a7298082b5a01c031b9c6506b0 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -2631,6 +2631,8 @@ This function is an internal primitive--use `make-frame' instead.  */)
     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.  */
+    if (! STRINGP (font))
+      font = x_new_fontset (f, "fontset-mac");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))
@@ -3731,6 +3733,8 @@ x_create_tip_frame (dpyinfo, parms, text)
     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.  */
+    if (! STRINGP (font))
+      font = x_new_fontset (f, "fontset-mac");
     if (! STRINGP (font))
       font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
     if (! STRINGP (font))