Mercurial > emacs
changeset 69918:96ba55a8591b
(set-locale-environment): Fix last change for when the locale's preferences
don't specify any encoding.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Mon, 10 Apr 2006 19:34:25 +0000 |
| parents | 9c5ad38c7798 |
| children | 32dd7ee0ac8b |
| files | lisp/international/mule-cmds.el |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)))