# HG changeset patch # User Kenichi Handa # Date 1197944965 0 # Node ID 6133244f82b77b4aac822a2b1497534a0c5b457a # Parent b2febf77e71ce9c1ed74318f28d7c2af915225df (fontset_find_font): Fix previous change. diff -r b2febf77e71c -r 6133244f82b7 src/fontset.c --- a/src/fontset.c Tue Dec 18 02:26:27 2007 +0000 +++ b/src/fontset.c Tue Dec 18 02:29:25 2007 +0000 @@ -614,23 +614,17 @@ 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); } } }