From: Kenichi Handa <handa@m17n.org>
Date: Mon, 30 Oct 2006 06:51:56 +0000 (+0000)
Subject: (Qlatin): New variable.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~708
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3fb88cc4b4d6ab7d6b113586f6bf38e62719126;p=emacs.git

(Qlatin): New variable.
(syms_of_fontset): Define it as a lisp symbol.
(Fset_fontset_font): If TARGET is `latin', use FONT_SPEC for
ASCII.
---

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;
 static Lisp_Object Qfontset;
 static Lisp_Object Qfontset_info;
 static Lisp_Object Qprepend, Qappend;
+static Lisp_Object Qlatin;
 
 /* Vector containing all fontsets.  */
 static Lisp_Object Vfontset_table;
@@ -1669,6 +1670,15 @@ appended.  By default, FONT-SPEC overrides the previous settings.  */)
 	  map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table,
 			  val);
 	  range_list = XCDR (val);
+	  if (EQ (target, Qlatin))
+	    {
+	      if (VECTORP (font_spec))
+		val = generate_ascii_font_name (FONTSET_NAME (fontset),
+						font_spec);
+	      else
+		val = font_spec;
+	      FONTSET_ASCII (fontset) = val;
+	    }
 	}
       if (CHARSETP (target))
 	{
@@ -2388,6 +2398,7 @@ syms_of_fontset ()
 
   DEFSYM (Qprepend, "prepend");
   DEFSYM (Qappend, "append");
+  DEFSYM (Qlatin, "latin");
 
   Vcached_fontset_data = Qnil;
   staticpro (&Vcached_fontset_data);