Mercurial > emacs
comparison src/xfns.c @ 21555:0927f341e390
(x_set_font): Give 2nd arg nil to Fquery_fontset.
(Fx_create_frame): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 15 Apr 1998 07:38:29 +0000 |
| parents | 3b63301ea296 |
| children | 6aaa0268fe91 |
comparison
equal
deleted
inserted
replaced
| 21554:90119d523093 | 21555:0927f341e390 |
|---|---|
| 1598 Lisp_Object fontset_name; | 1598 Lisp_Object fontset_name; |
| 1599 Lisp_Object frame; | 1599 Lisp_Object frame; |
| 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) |
| 1607 ? x_new_fontset (f, XSTRING (fontset_name)->data) | 1607 ? x_new_fontset (f, XSTRING (fontset_name)->data) |
| 1608 : x_new_font (f, XSTRING (arg)->data)); | 1608 : x_new_font (f, XSTRING (arg)->data)); |
| 3289 | 3289 |
| 3290 BLOCK_INPUT; | 3290 BLOCK_INPUT; |
| 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 |
| 3298 font = x_new_font (f, XSTRING (font)->data); | 3298 font = x_new_font (f, XSTRING (font)->data); |
| 3299 } | 3299 } |