From: Kenichi Handa <handa@m17n.org>
Date: Mon, 29 Dec 2003 07:10:09 +0000 (+0000)
Subject: (reset-language-environment): Call
X-Git-Tag: ttn-vms-21-2-B4~8123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0077e394d5eb006788f648ea27da8139ad89d539;p=emacs.git

(reset-language-environment): Call
set-overriding-fontspec-internal with nil.
(set-language-environment): Call set-overriding-fontspec-internal
if the language environment specify `overriding-fontspec'.
(language-info-alist): Doc added.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5e957d6b8ab..18ddf566c7b 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1006,6 +1006,12 @@ Meaningful values for KEY include
 			environment.
   features           value is a list of features requested in this
 			language environment.
+  ctext-non-standard-encodings
+		     value is a list of non-standard encoding
+		     names used in extended segments of CTEXT.
+		     See the variable
+		     `ctext-non-standard-encodings' for more
+		     detail.
 
 The following keys take effect only when multibyte characters are
 globally disabled, i.e. the value of `default-enable-multibyte-characters'
@@ -1685,7 +1691,9 @@ The default status is as follows:
   ;; (set-keyboard-coding-system-internal nil)
 
   (setq nonascii-translation-table nil
-	nonascii-insert-offset 0))
+	nonascii-insert-offset 0)
+
+  (set-overriding-fontspec-internal nil))
 
 (reset-language-environment)
 
@@ -1791,6 +1799,12 @@ specifies the character set for the major languages of Western Europe."
     (while required-features
       (require (car required-features))
       (setq required-features (cdr required-features))))
+
+  (let ((overriding-fontspec (get-language-info language-name 
+						'overriding-fontspec)))
+    (if overriding-fontspec
+	(set-overriding-fontspec-internal overriding-fontspec)))
+
   (let ((func (get-language-info language-name 'setup-function)))
     (if (functionp func)
 	(funcall func)))