(set-language-environment): Check

for charset property of environment.

1 files changed, 3 insertions, 1 deletions

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.