# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1046153961 0
# Node ID f491c5cee974acac6cfd7096b890d7d8e17b70c5
# Parent  bd3e068b492aff42f7e9e3ff826a47835b0b710a
(setenv): Fix previous change.

diff -r bd3e068b492a -r f491c5cee974 lisp/env.el
--- a/lisp/env.el	Tue Feb 25 06:00:40 2003 +0000
+++ b/lisp/env.el	Tue Feb 25 06:19:21 2003 +0000
@@ -121,13 +121,11 @@
 	     nil
 	     t))))
   (if (and (multibyte-string-p variable) locale-coding-system)
-      (unless (memq (coding-system-base locale-coding-system)
-		    (find-coding-systems-string (concat variable value)))
-	(error "Can't encode `%s=%s' with `locale-coding-system'"
-	       variable (or value "")))
-    (unless (memq 'undecided (find-coding-systems-string variable))
-      (error "Can't encode `%s=%s' with unspecified `locale-coding-system'"
-	     variable (or value ""))))
+      (let ((codings (find-coding-systems-string (concat variable value))))
+	(unless (or (eq 'undecided (car codings))
+		    (memq (coding-system-base locale-coding-system) codings))
+	  (error "Can't encode `%s=%s' with `locale-coding-system'"
+		 variable (or value "")))))
   (if unset 
       (setq value nil)
     (if substitute-env-vars