Mercurial > emacs

comparison lisp/international/mule-cmds.el @ 69918:96ba55a8591b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 d6c2324400c7
children c5d2bd581ee7 24cf4bf418dc c156f6a9e7b5
comparison
equal deleted inserted replaced
69917:9c5ad38c7798 69918:96ba55a8591b
2524 (setq language-name charset-language-name))) 2524 (setq language-name charset-language-name)))
2525 2525
2526 ;; If a specific EOL conversion was specified in the default 2526 ;; If a specific EOL conversion was specified in the default
2527 ;; buffer-file-coding-system, preserve it in the coding system 2527 ;; buffer-file-coding-system, preserve it in the coding system
2528 ;; we will be using from now on. 2528 ;; we will be using from now on.
2529 (if (memq default-eol-type '(0 1 2 unix dos mac)) 2529 (if (and (memq default-eol-type '(0 1 2 unix dos mac))
2530 coding-system
2531 (coding-system-p coding-system))
2530 (setq coding-system (coding-system-change-eol-conversion 2532 (setq coding-system (coding-system-change-eol-conversion
2531 coding-system default-eol-type))) 2533 coding-system default-eol-type)))
2532 2534
2533 (when language-name 2535 (when language-name
2534 2536