[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/04/08 14:55:30

Index: mule-cmds.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -b -r1.324 -r1.325
--- mule-cmds.el        12 Mar 2008 17:47:59 -0000      1.324
+++ mule-cmds.el        8 Apr 2008 14:55:30 -0000       1.325
@@ -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,