diff options
Diffstat (limited to 'src/macfns.c')
| -rw-r--r-- | src/macfns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macfns.c b/src/macfns.c index 0ede52147b0..aab91cf41f4 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -2654,7 +2654,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 2654 | { | 2654 | { |
| 2655 | tem = Fquery_fontset (font, Qnil); | 2655 | tem = Fquery_fontset (font, Qnil); |
| 2656 | if (STRINGP (tem)) | 2656 | if (STRINGP (tem)) |
| 2657 | font = x_new_fontset (f, SDATA (tem)); | 2657 | font = x_new_fontset (f, tem); |
| 2658 | else | 2658 | else |
| 2659 | font = x_new_font (f, SDATA (font)); | 2659 | font = x_new_font (f, SDATA (font)); |
| 2660 | } | 2660 | } |
| @@ -2667,7 +2667,7 @@ This function is an internal primitive--use `make-frame' instead. */) | |||
| 2667 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); | 2667 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); |
| 2668 | /* If those didn't work, look for something which will at least work. */ | 2668 | /* If those didn't work, look for something which will at least work. */ |
| 2669 | if (! STRINGP (font)) | 2669 | if (! STRINGP (font)) |
| 2670 | font = x_new_fontset (f, "fontset-standard"); | 2670 | font = x_new_fontset (f, build_string ("fontset-standard")); |
| 2671 | if (! STRINGP (font)) | 2671 | if (! STRINGP (font)) |
| 2672 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); | 2672 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); |
| 2673 | if (! STRINGP (font)) | 2673 | if (! STRINGP (font)) |
| @@ -3881,7 +3881,7 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3881 | { | 3881 | { |
| 3882 | tem = Fquery_fontset (font, Qnil); | 3882 | tem = Fquery_fontset (font, Qnil); |
| 3883 | if (STRINGP (tem)) | 3883 | if (STRINGP (tem)) |
| 3884 | font = x_new_fontset (f, SDATA (tem)); | 3884 | font = x_new_fontset (f, tem); |
| 3885 | else | 3885 | else |
| 3886 | font = x_new_font (f, SDATA (font)); | 3886 | font = x_new_font (f, SDATA (font)); |
| 3887 | } | 3887 | } |
| @@ -3895,7 +3895,7 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3895 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); | 3895 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); |
| 3896 | /* If those didn't work, look for something which will at least work. */ | 3896 | /* If those didn't work, look for something which will at least work. */ |
| 3897 | if (! STRINGP (font)) | 3897 | if (! STRINGP (font)) |
| 3898 | font = x_new_fontset (f, "fontset-standard"); | 3898 | font = x_new_fontset (f, build_string ("fontset-standard")); |
| 3899 | if (! STRINGP (font)) | 3899 | if (! STRINGP (font)) |
| 3900 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); | 3900 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); |
| 3901 | if (! STRINGP (font)) | 3901 | if (! STRINGP (font)) |