diff options
| author | Kenichi Handa <handa@m17n.org> | 2007-12-18 02:29:25 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2007-12-18 02:29:25 +0000 |
| commit | 53b26aae438806656ecc0aa47e12783254e87e2f (patch) | |
| tree | 590e92d6c494fb37d889d660171d1e37a69b471c /src/fontset.c | |
| parent | e670e82736c894df09674fbd6b1391c147013093 (diff) | |
| download | emacs-53b26aae438806656ecc0aa47e12783254e87e2f.tar.gz | |
(fontset_find_font): Fix previous change.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/fontset.c b/src/fontset.c index 4b89e6a279b..09a57b08a86 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -614,23 +614,17 @@ fontset_find_font (fontset, c, face, id, fallback) if (! NILP (script)) { Lisp_Object font_spec = Ffont_spec (0, NULL); - + Lisp_Object args[2], tmp; + ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1); ASET (font_spec, FONT_EXTRA_INDEX, Fcons (Fcons (QCscript, script), Qnil)); - if (NILP (elt)) - elt = Fvector (1, &font_spec); - else - { - Lisp_Object args[2], tmp; - - args[0] = elt; - tmp = Fmake_vector (make_number (3), Qnil); - ASET (tmp, 0, font_spec); - ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp)); - args[1] = Fvector (1, &tmp); - elt = Fvconcat (2, args); - } + args[0] = elt; + tmp = Fmake_vector (make_number (3), Qnil); + ASET (tmp, 0, font_spec); + ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp)); + args[1] = Fvector (1, &tmp); + elt = Fvconcat (2, args); } } } |