From: Dave Love <fx@gnu.org>
Date: Sat, 5 Oct 2002 19:04:00 +0000 (+0000)
Subject: (set-language-environment): Check
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~299
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b74b0c7b668ca958263dfe73a2b41e27e4efc0e;p=emacs.git

(set-language-environment): Check
for charset property of environment.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7c1b1a13737..6e925d33cf4 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1442,7 +1442,9 @@ specifies the character set for the major languages of Western Europe."
 
   ;; Fixme: default from the environment coding system where that's
   ;; charset-based.
-  (apply 'set-charset-priority  (get-language-info language-name 'charset))
+  (if (get-language-info language-name 'charset)
+      (apply 'set-charset-priority  (get-language-info language-name
+						       'charset)))
 
   ;; Note: For DOS, we assumed that the charset cpXXX is already
   ;; defined.