Mercurial > emacs

comparison src/fontset.c @ 91241:6133244f82b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(fontset_find_font): Fix previous change.
author Kenichi Handa <handa@m17n.org>
date Tue, 18 Dec 2007 02:29:25 +0000
parents 29d8135e8f58
children 2de541db2c82
comparison
equal deleted inserted replaced
91240:b2febf77e71c 91241:6133244f82b7
612 Lisp_Object script = CHAR_TABLE_REF (Vchar_script_table, c); 612 Lisp_Object script = CHAR_TABLE_REF (Vchar_script_table, c);
613 613
614 if (! NILP (script)) 614 if (! NILP (script))
615 { 615 {
616 Lisp_Object font_spec = Ffont_spec (0, NULL); 616 Lisp_Object font_spec = Ffont_spec (0, NULL);
617 617 Lisp_Object args[2], tmp;
618
618 ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1); 619 ASET (font_spec, FONT_REGISTRY_INDEX, Qiso10646_1);
619 ASET (font_spec, FONT_EXTRA_INDEX, 620 ASET (font_spec, FONT_EXTRA_INDEX,
620 Fcons (Fcons (QCscript, script), Qnil)); 621 Fcons (Fcons (QCscript, script), Qnil));
621 if (NILP (elt)) 622 args[0] = elt;
622 elt = Fvector (1, &font_spec); 623 tmp = Fmake_vector (make_number (3), Qnil);
623 else 624 ASET (tmp, 0, font_spec);
624 { 625 ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp));
625 Lisp_Object args[2], tmp; 626 args[1] = Fvector (1, &tmp);
626 627 elt = Fvconcat (2, args);
627 args[0] = elt;
628 tmp = Fmake_vector (make_number (3), Qnil);
629 ASET (tmp, 0, font_spec);
630 ASET (tmp, 1, CHARSET_SYMBOL_ID (Qunicode_bmp));
631 args[1] = Fvector (1, &tmp);
632 elt = Fvconcat (2, args);
633 }
634 } 628 }
635 } 629 }
636 } 630 }
637 else 631 else
638 { 632 {