Mercurial > emacs
changeset 93865:b9a2a750f172
(set-locale-environment): Don't warn if coding system doesn't agree with system
locale (this reverts changes by Dave Love, dated 2002-10-27 and 2002-10-09).
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 08 Apr 2008 14:55:30 +0000 |
| parents | a238cf768432 |
| children | 1f769203aa6c |
| files | lisp/international/mule-cmds.el |
| diffstat | 1 files changed, 1 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el Tue Apr 08 14:46:49 2008 +0000 +++ b/lisp/international/mule-cmds.el Tue Apr 08 14:55:30 2008 +0000 @@ -2605,21 +2605,7 @@ ;; Fixme: perhaps prefer-coding-system should set this too. ;; But it's not the time to do such a fundamental change. (setq default-sendmail-coding-system coding-system) - (setq locale-coding-system coding-system)) - - (when (get-language-info current-language-environment 'coding-priority) - (let ((codeset (locale-info 'codeset)) - (coding-system (car (coding-system-priority-list)))) - (when codeset - (let ((cs (coding-system-aliases coding-system)) - result) - (while (and cs (not result)) - (setq result - (locale-charset-match-p (symbol-name (pop cs)) - (locale-info 'codeset)))) - (unless result - (message "Warning: Default coding system `%s' disagrees with -system codeset `%s' for this locale." coding-system codeset)))))))) + (setq locale-coding-system coding-system)))) ;; On Windows, override locale-coding-system, ;; default-file-name-coding-system, keyboard-coding-system,