diff options
| author | YAMAMOTO Mitsuharu | 2005-04-22 04:56:11 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-04-22 04:56:11 +0000 |
| commit | 6f2d53406a51d6d407cf17699437010b61b9e52c (patch) | |
| tree | 1fc2c6c8d9b2023441dbb191ccba4cc9e4f8dcce /src | |
| parent | 6fa63007d041fa899a94700bf09de6cd403d0d5e (diff) | |
| download | emacs-6f2d53406a51d6d407cf17699437010b61b9e52c.tar.gz emacs-6f2d53406a51d6d407cf17699437010b61b9e52c.zip | |
(Fx_create_frame, x_create_tip_frame): Pass Lisp string as the second
argument for x_new_fontset.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/macfns.c b/src/macfns.c index 0243e35e94b..4247888fb18 100644 --- a/src/macfns.c +++ b/src/macfns.c | |||
| @@ -2632,7 +2632,7 @@ 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"); | 2635 | font = x_new_fontset (f, build_string ("fontset-mac")); |
| 2636 | if (! STRINGP (font)) | 2636 | if (! STRINGP (font)) |
| 2637 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); | 2637 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); |
| 2638 | if (! STRINGP (font)) | 2638 | if (! STRINGP (font)) |
| @@ -3730,7 +3730,7 @@ x_create_tip_frame (dpyinfo, parms, text) | |||
| 3730 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); | 3730 | font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1"); |
| 3731 | /* If those didn't work, look for something which will at least work. */ | 3731 | /* If those didn't work, look for something which will at least work. */ |
| 3732 | if (! STRINGP (font)) | 3732 | if (! STRINGP (font)) |
| 3733 | font = x_new_fontset (f, "fontset-mac"); | 3733 | font = x_new_fontset (f, build_string ("fontset-mac")); |
| 3734 | if (! STRINGP (font)) | 3734 | if (! STRINGP (font)) |
| 3735 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); | 3735 | font = x_new_font (f, "-*-monaco-*-12-*-mac-roman"); |
| 3736 | if (! STRINGP (font)) | 3736 | if (! STRINGP (font)) |