diff options
| author | Kenichi Handa | 1998-04-15 07:38:29 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1998-04-15 07:38:29 +0000 |
| commit | 49965a29984ace72e4f16b919980f2f51a422d01 (patch) | |
| tree | 0187eb4e0dce03373d4cd0fd2e23fb71d0a5aa41 /src | |
| parent | b5a647bfb59b5e35684252cf5a17775510452223 (diff) | |
| download | emacs-49965a29984ace72e4f16b919980f2f51a422d01.tar.gz emacs-49965a29984ace72e4f16b919980f2f51a422d01.zip | |
(x_set_font): Give 2nd arg nil to Fquery_fontset.
(Fx_create_frame): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index 520a7022a8b..68a0e631048 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1600,7 +1600,7 @@ x_set_font (f, arg, oldval) | |||
| 1600 | 1600 | ||
| 1601 | CHECK_STRING (arg, 1); | 1601 | CHECK_STRING (arg, 1); |
| 1602 | 1602 | ||
| 1603 | fontset_name = Fquery_fontset (arg); | 1603 | fontset_name = Fquery_fontset (arg, Qnil); |
| 1604 | 1604 | ||
| 1605 | BLOCK_INPUT; | 1605 | BLOCK_INPUT; |
| 1606 | result = (STRINGP (fontset_name) | 1606 | result = (STRINGP (fontset_name) |
| @@ -3291,7 +3291,7 @@ This function is an internal primitive--use `make-frame' instead.") | |||
| 3291 | /* First, try whatever font the caller has specified. */ | 3291 | /* First, try whatever font the caller has specified. */ |
| 3292 | if (STRINGP (font)) | 3292 | if (STRINGP (font)) |
| 3293 | { | 3293 | { |
| 3294 | tem = Fquery_fontset (font); | 3294 | tem = Fquery_fontset (font, Qnil); |
| 3295 | if (STRINGP (tem)) | 3295 | if (STRINGP (tem)) |
| 3296 | font = x_new_fontset (f, XSTRING (tem)->data); | 3296 | font = x_new_fontset (f, XSTRING (tem)->data); |
| 3297 | else | 3297 | else |