Mercurial > emacs
comparison src/xterm.c @ 89002:705b93129869
(main): In the case of --unibyte, instead of aborting on finding
non-empty buffer, make it unibyte.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Mon, 19 Aug 2002 06:11:15 +0000 |
parents | b604878589f4 |
children | 3bbfb5d2bb52 |
comparison
equal
deleted
inserted
replaced
89001:f595663c7323 | 89002:705b93129869 |
---|---|
12287 /* Can't load ASCII font. */ | 12287 /* Can't load ASCII font. */ |
12288 return Qnil; | 12288 return Qnil; |
12289 | 12289 |
12290 if (fontset < 0) | 12290 if (fontset < 0) |
12291 { | 12291 { |
12292 Lisp_Object fontlist; | 12292 Lisp_Object func; |
12293 | 12293 |
12294 fontlist = Fcons (Fcons (Qascii, Fcons (result, Qnil)), Qnil); | 12294 func = intern ("create-fontset-from-ascii-font"); |
12295 Fnew_fontset (result, fontlist); | 12295 if (! NILP (Ffboundp (func))) |
12296 result = call2 (func, result, result); | |
12297 else | |
12298 Fnew_fontset (result, | |
12299 Fcons (Fcons (Qascii, Fcons (result, Qnil)), Qnil)); | |
12296 fontset = fs_query_fontset (result, 0); | 12300 fontset = fs_query_fontset (result, 0); |
12297 } | 12301 } |
12298 | 12302 |
12299 /* Since x_new_font doesn't update any fontset information, do it now. */ | 12303 /* Since x_new_font doesn't update any fontset information, do it now. */ |
12300 f->output_data.x->fontset = fontset; | 12304 f->output_data.x->fontset = fontset; |