From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 8 Apr 2008 14:57:02 +0000 (+0000)
Subject: (set-locale-environment): Don't warn if	coding system doesn't agree with system
X-Git-Tag: emacs-pretest-23.0.90~6433
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80e3310b378e05683a1fde3845499165640ac994;p=emacs.git

(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).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd1cee13b1e..c36567aac20 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-08  Juanma Barranquero  <lekktu@gmail.com>
 
+	* international/mule-cmds.el (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).
+
 	* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
 	* emacs-lisp/cl-macs.el (get-setf-method): Use `string-match-p'.
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 2ce56546bfe..a04ffe18772 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2605,21 +2605,7 @@ See also `locale-charset-language-names', `locale-language-names',
 	  ;; 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,