From: Eli Zaretskii Date: Mon, 10 Apr 2006 19:34:25 +0000 (+0000) Subject: (set-locale-environment): Fix last change for when the locale's preferences X-Git-Tag: emacs-pretest-22.0.90~3230 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8bca692e7e827cfb71fa368bbbace7b30e5d77e2;p=emacs.git (set-locale-environment): Fix last change for when the locale's preferences don't specify any encoding. --- diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 17004f6bcd5..69dbb5c2445 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2526,7 +2526,9 @@ See also `locale-charset-language-names', `locale-language-names', ;; 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)))