# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1144697665 0
# Node ID 96ba55a8591baf805b4aafa028628c7f9047d4ea
# Parent  9c5ad38c7798d4f2ab18db9f6c1375f0f711345c
(set-locale-environment): Fix last change for when the locale's preferences
don't specify any encoding.

diff -r 9c5ad38c7798 -r 96ba55a8591b lisp/international/mule-cmds.el
--- a/lisp/international/mule-cmds.el	Mon Apr 10 19:16:30 2006 +0000
+++ b/lisp/international/mule-cmds.el	Mon Apr 10 19:34:25 2006 +0000
@@ -2526,7 +2526,9 @@
 	;; If a specific EOL conversion was specified in the default
 	;; buffer-file-coding-system, preserve it in the coding system
 	;; we will be using from now on.
-	(if (memq default-eol-type '(0 1 2 unix dos mac))
+	(if (and (memq default-eol-type '(0 1 2 unix dos mac))
+		 coding-system
+		 (coding-system-p coding-system))
 	    (setq coding-system (coding-system-change-eol-conversion
 				 coding-system default-eol-type)))