Fix mime-charset properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8bc0b220a4409cb7b3da186629ae46504ad2ac82..6cb5abfc054858d50ba655057b26b6a7dfbd7340 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-14  Dave Love  <fx@gnu.org>
+
+       * language/european.el: Fix mime-charset properties.
+
+       * international/mule-cmds.el (sort-coding-systems) 
+       (select-safe-coding-system, select-message-coding-system): Use
+       :mime-charset, not 'mime-charset.
+
+       * international/mule-conf.el (utf-8-emacs): Add various
+       :mime-charset properties.
+
 2002-05-13  Dave Love  <fx@gnu.org>
 
        * international/encoded-kb.el (encoded-kbd-self-insert-ccl): Fix

diff --git a/lisp/language/european.el b/lisp/language/european.el
index 5698c74093602c9bf0936ecddccd2523739baf94..07bd14aea6a30d8e7a481015e308893b3864b077 100644 (file)
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995, 1997, 2001 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
 ;; Keywords: multilingual, European
 
@@ -68,7 +68,7 @@ Indonesian/Malay, Tagalog (Philippines), Swahili and Afrikaans."))
   :coding-type 'charset
   :mnemonic ?2
   :charset-list '(iso-8859-2)
-  :plist '(mime-charset iso-8859-2))
+  :mime-charset 'iso-8859-2)
 
 (define-coding-system-alias 'iso-8859-2 'iso-latin-2)
 (define-coding-system-alias 'latin-2 'iso-latin-2)
@@ -101,7 +101,7 @@ We also have specific language environments for the following languages:
   :coding-type 'charset
   :mnemonic ?3
   :charset-list '(iso-8859-3)
-  :plist '(mime-charset iso-8859-3))
+  :mime-charset 'iso-8859-3)
 
 (define-coding-system-alias 'iso-8859-3 'iso-latin-3)
 (define-coding-system-alias 'latin-3 'iso-latin-3)
@@ -128,7 +128,7 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set:
   :coding-type 'charset
   :mnemonic ?4
   :charset-list '(iso-8859-4)
-  :plist '(mime-charset iso-8859-4))
+  :mime-charset 'iso-8859-4)
 
 (define-coding-system-alias 'iso-8859-4 'iso-latin-4)
 (define-coding-system-alias 'latin-4 'iso-latin-4)
@@ -155,7 +155,7 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set:
   :coding-type 'charset
   :mnemonic ?9
   :charset-list '(iso-8859-9)
-  :plist '(mime-charset iso-8859-9))
+  :mime-charset 'iso-8859-9)
 
 (define-coding-system-alias 'iso-8859-9 'iso-latin-5)
 (define-coding-system-alias 'latin-5 'iso-latin-5)
@@ -180,7 +180,7 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set:
   ;; `W' for `Welsh', since `C' for `Celtic' is taken.
   :mnemonic ?W                         
   :charset-list '(iso-8859-14)
-  :plist '(mime-charset iso-8859-14))
+  :mime-charset 'iso-8859-14)
 
 (define-coding-system-alias 'iso-8859-14 'iso-latin-8)
 (define-coding-system-alias 'latin-8 'iso-latin-8)
@@ -210,7 +210,7 @@ covered by other ISO-8859 character sets:
   ;; `0' for `Latin-0'
   :mnemonic ?0
   :charset-list '(iso-8859-15)
-  :plist '(mime-charset iso-8859-15))
+  :mime-charset 'iso-8859-15)
 
 (define-coding-system-alias 'iso-8859-15 'iso-latin-9)
 (define-coding-system-alias 'latin-9 'iso-latin-9)
@@ -225,7 +225,7 @@ covered by other ISO-8859 character sets:
             (unibyte-display . iso-latin-9)
             (input-method . "latin-9-prefix")
             (sample-text
-             . "AVE. \e,b&(48<=>\e(B \e,b$\e(B")
+             . "AVE. \e,B)9.>\e,b<=\e,_/\e(B \e,b$\e(B")
             (documentation . "\
 This language environment is a generic one for the Latin-9 (ISO-8859-15)
 character set which supports the same languages as Latin-1 with the
@@ -322,7 +322,7 @@ but it selects the Dutch tutorial."))
             (unibyte-syntax . "latin-5")
             (unibyte-display . iso-latin-5)
             (input-method . "turkish-postfix")
-            (sample-text . "Turkish (T\e,M|\e(Brk\e,Mg\e(Be)       Merhaba")
+            (sample-text . "Turkish (T\e,A|\e(Brk\e,Ag\e(Be)       Merhaba")
             (documentation . t)))
 
 ;; Polish ISO 8859-2 environment.
@@ -338,7 +338,7 @@ but it selects the Dutch tutorial."))
           (unibyte-syntax . "latin-2")
           (unibyte-display . iso-8859-2)
           (tutorial . "TUTORIAL.pl")
-          (sample-text . "P\e,Bs\e(Bjd\e,B<\e(B, ki\e,Bq\e(B-\e,B?\e(Be t\e,Bj\e(B chmurno\e,B6f\e(B w g\e,B31\e(Bb flaszy")
+          (sample-text . "P\e,As\e(Bjd\e,B<\e(B, ki\e,Bq\e(B-\e,B?\e(Be t\e,Bj\e(B chmurno\e,B6f\e(B w g\e,B31\e(Bb flaszy")
           (documentation . t))
  '("European"))