Update list of Emacs encoding names.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index eda7d84823931616f38aecc3c047bdf389a0d800..a5725623cf5354a50c0a76229b0e1b914bde84b2 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-01  Bruno Haible  <haible@clisp.cons.org>
+
+       * po-mode.el (po-content-type-charset-alist): Add entries for
+       ISO-8859-15, GB2312, EUC-JP, EUC-KR, BIG5, SHIFT_JIS, TIS-620, VISCII.
+
 2001-06-25  Bruno Haible  <haible@clisp.cons.org>
 
        * po-mode.el (po-find-file-coding-system): Make it work in XEmacs 20

diff --git a/misc/po-mode.el b/misc/po-mode.el
index 62fdf92c07be8af33be809dad5de3f8880b5e5b4..df50ace126386c9bf834f8c5dc53d514cc05f362 100644 (file)
--- a/misc/po-mode.el
+++ b/misc/po-mode.el
@@ -581,8 +581,8 @@ M-S  Ignore path          M-A  Ignore PO file      *M-L  Ignore lexicon
     (ISO_8859-9 . iso-8859-9)
     ;(ISO-8859-13 . ??)
     ;(ISO_8859-13 . ??)
-    ;(ISO-8859-15 . ??)
-    ;(ISO_8859-15 . ??)
+    (ISO-8859-15 . iso-8859-15) ; requires Emacs 21
+    (ISO_8859-15 . iso-8859-15) ; requires Emacs 21
     (KOI8-R . koi8-r)
     ;(KOI8-U . ??)
     ;(CP850 . ??)
@@ -599,18 +599,19 @@ M-S  Ignore path          M-A  Ignore PO file      *M-L  Ignore lexicon
     ;(CP1255 . ??)
     ;(CP1256 . ??)
     ;(CP1257 . ??)
-    ;(GB2312 . euc-cn)
-    ;(EUC-JP . euc-jp)
-    ;(EUC-KR . euc-kr)
+    (GB2312 . cn-gb-2312)  ; also named 'gb2312' in XEmacs 21 or Emacs 21
+                           ; also named 'euc-cn' in Emacs 20 or Emacs 21
+    (EUC-JP . euc-jp)
+    (EUC-KR . euc-kr)
     ;(EUC-TW . ??)
-    ;(BIG5 . big5)
-    ;(BIG5HKSCS . ??)
+    (BIG5 . big5)
+    ;(BIG5-HKSCS . ??)
     ;(GBK . ??)
     ;(GB18030 . ??)
-    ;(SJIS . shift_jis)
+    (SHIFT_JIS . shift_jis)
     ;(JOHAB . ??)
-    ;(TIS-620 . th-tis620)
-    ;(VISCII . viscii)
+    (TIS-620 . tis-620)    ; requires Emacs 20 or Emacs 21
+    (VISCII . viscii)      ; requires Emacs 20 or Emacs 21
     (UTF-8 . utf-8)        ; requires Mule-UCS in Emacs 20, or Emacs 21
     )
   "How to convert a GNU libc/libiconv canonical charset name as seen in