aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2007-12-18 02:29:25 +0000
committerKenichi Handa2007-12-18 02:29:25 +0000
commit53b26aae438806656ecc0aa47e12783254e87e2f (patch)
tree590e92d6c494fb37d889d660171d1e37a69b471c /src
parente670e82736c894df09674fbd6b1391c147013093 (diff)
downloademacs-53b26aae438806656ecc0aa47e12783254e87e2f.tar.gz
emacs-53b26aae438806656ecc0aa47e12783254e87e2f.zip
(fontset_find_font): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c22
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)
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 }