aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-10-30 06:51:56 +0000
committerKenichi Handa2006-10-30 06:51:56 +0000
commitc3fb88cc4b4d6ab7d6b113586f6bf38e62719126 (patch)
treef56a093b6120104626bd232af6dd415efe3cba44 /src
parent38894b7716010a8e60718a72e06937ceedf105f1 (diff)
downloademacs-c3fb88cc4b4d6ab7d6b113586f6bf38e62719126.tar.gz
emacs-c3fb88cc4b4d6ab7d6b113586f6bf38e62719126.zip
(Qlatin): New variable.
(syms_of_fontset): Define it as a lisp symbol. (Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for ASCII.
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c
index dd4b7620452..b34b7a31faa 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -202,6 +202,7 @@ extern Lisp_Object Qfont;
202static Lisp_Object Qfontset; 202static Lisp_Object Qfontset;
203static Lisp_Object Qfontset_info; 203static Lisp_Object Qfontset_info;
204static Lisp_Object Qprepend, Qappend; 204static Lisp_Object Qprepend, Qappend;
205static Lisp_Object Qlatin;
205 206
206/* Vector containing all fontsets. */ 207/* Vector containing all fontsets. */
207static Lisp_Object Vfontset_table; 208static Lisp_Object Vfontset_table;
@@ -1669,6 +1670,15 @@ appended. By default, FONT-SPEC overrides the previous settings. */)
1669 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, 1670 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table,
1670 val); 1671 val);
1671 range_list = XCDR (val); 1672 range_list = XCDR (val);
1673 if (EQ (target, Qlatin))
1674 {
1675 if (VECTORP (font_spec))
1676 val = generate_ascii_font_name (FONTSET_NAME (fontset),
1677 font_spec);
1678 else
1679 val = font_spec;
1680 FONTSET_ASCII (fontset) = val;
1681 }
1672 } 1682 }
1673 if (CHARSETP (target)) 1683 if (CHARSETP (target))
1674 { 1684 {
@@ -2388,6 +2398,7 @@ syms_of_fontset ()
2388 2398
2389 DEFSYM (Qprepend, "prepend"); 2399 DEFSYM (Qprepend, "prepend");
2390 DEFSYM (Qappend, "append"); 2400 DEFSYM (Qappend, "append");
2401 DEFSYM (Qlatin, "latin");
2391 2402
2392 Vcached_fontset_data = Qnil; 2403 Vcached_fontset_data = Qnil;
2393 staticpro (&Vcached_fontset_data); 2404 staticpro (&Vcached_fontset_data);