update.

[elisp/apel.git] / mcs-e20.el

diff --git a/mcs-e20.el b/mcs-e20.el
index a2cda9b..908dcad 100644 (file)
--- a/mcs-e20.el
+++ b/mcs-e20.el
@@ -1,6 +1,6 @@
 ;;; mcs-e20.el --- MIME charset implementation for Emacs 20.1 and 20.2
 
-;; Copyright (C) 1996,1997,1998,1999 Free Software Foundation, Inc.
+;; Copyright (C) 1996,1997,1998,1999,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Keywords: emulation, compatibility, Mule
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -28,10 +28,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'static)
-  (require 'poem)
-  )
+(require 'pces)
+(eval-when-compile (require 'static))
 
 (defsubst encode-mime-charset-region (start end charset &optional lbt)
   "Encode the text between START and END as MIME CHARSET."
@@ -68,44 +66,50 @@
 
 
 (defvar charsets-mime-charset-alist
-  '(((ascii)                                           . us-ascii)
-    ((ascii latin-iso8859-1)                           . iso-8859-1)
-    ((ascii latin-iso8859-2)                           . iso-8859-2)
-    ((ascii latin-iso8859-3)                           . iso-8859-3)
-    ((ascii latin-iso8859-4)                           . iso-8859-4)
-;;; ((ascii cyrillic-iso8859-5)                                . iso-8859-5)
-    ((ascii cyrillic-iso8859-5)                                . koi8-r)
-    ((ascii arabic-iso8859-6)                          . iso-8859-6)
-    ((ascii greek-iso8859-7)                           . iso-8859-7)
-    ((ascii hebrew-iso8859-8)                          . iso-8859-8)
-    ((ascii latin-iso8859-9)                           . iso-8859-9)
-    ((ascii latin-jisx0201
-           japanese-jisx0208-1978 japanese-jisx0208)   . iso-2022-jp)
-    ((ascii latin-jisx0201
-           katakana-jisx0201 japanese-jisx0208)        . shift_jis)
-    ((ascii korean-ksc5601)                            . euc-kr)
-    ((ascii chinese-gb2312)                            . gb2312)
-    ((ascii chinese-big5-1 chinese-big5-2)             . big5)
-    ((ascii thai-tis620 composition)                   . tis-620)
-    ((ascii latin-iso8859-1 greek-iso8859-7
-           latin-jisx0201 japanese-jisx0208-1978
-           chinese-gb2312 japanese-jisx0208
-           korean-ksc5601 japanese-jisx0212)           . iso-2022-jp-2)
-;     ((ascii latin-iso8859-1 greek-iso8859-7
-;          latin-jisx0201 japanese-jisx0208-1978
-;          chinese-gb2312 japanese-jisx0208
-;          korean-ksc5601 japanese-jisx0212
-;          chinese-cns11643-1 chinese-cns11643-2)      . iso-2022-int-1)
-;     ((ascii latin-iso8859-1 latin-iso8859-2
-;          cyrillic-iso8859-5 greek-iso8859-7
-;          latin-jisx0201 japanese-jisx0208-1978
-;          chinese-gb2312 japanese-jisx0208
-;          korean-ksc5601 japanese-jisx0212
-;          chinese-cns11643-1 chinese-cns11643-2
-;          chinese-cns11643-3 chinese-cns11643-4
-;          chinese-cns11643-5 chinese-cns11643-6
-;          chinese-cns11643-7)                         . iso-2022-int-1)
-    ))
+  (delq
+   nil
+   `(((ascii)                                          . us-ascii)
+     ((ascii latin-iso8859-1)                          . iso-8859-1)
+     ((ascii latin-iso8859-2)                          . iso-8859-2)
+     ((ascii latin-iso8859-3)                          . iso-8859-3)
+     ((ascii latin-iso8859-4)                          . iso-8859-4)
+     ;;((ascii cyrillic-iso8859-5)                     . iso-8859-5)
+     ((ascii cyrillic-iso8859-5)                       . koi8-r)
+     ((ascii arabic-iso8859-6)                         . iso-8859-6)
+     ((ascii greek-iso8859-7)                          . iso-8859-7)
+     ((ascii hebrew-iso8859-8)                         . iso-8859-8)
+     ((ascii latin-iso8859-9)                          . iso-8859-9)
+     ,(if (find-coding-system 'iso-8859-14)
+         '((ascii latin-iso8859-14)                    . iso-8859-14))
+     ,(if (find-coding-system 'iso-8859-15)
+         '((ascii latin-iso8859-15)                    . iso-8859-15))
+     ((ascii latin-jisx0201
+            japanese-jisx0208-1978 japanese-jisx0208)  . iso-2022-jp)
+     ((ascii latin-jisx0201
+            katakana-jisx0201 japanese-jisx0208)       . shift_jis)
+     ((ascii korean-ksc5601)                           . euc-kr)
+     ((ascii chinese-gb2312)                           . gb2312)
+     ((ascii chinese-big5-1 chinese-big5-2)            . big5)
+     ((ascii thai-tis620 composition)                  . tis-620)
+     ((ascii latin-iso8859-1 greek-iso8859-7
+            latin-jisx0201 japanese-jisx0208-1978
+            chinese-gb2312 japanese-jisx0208
+            korean-ksc5601 japanese-jisx0212)          . iso-2022-jp-2)
+     ;;((ascii latin-iso8859-1 greek-iso8859-7
+     ;;        latin-jisx0201 japanese-jisx0208-1978
+     ;;        chinese-gb2312 japanese-jisx0208
+     ;;        korean-ksc5601 japanese-jisx0212
+     ;;        chinese-cns11643-1 chinese-cns11643-2)  . iso-2022-int-1)
+     ;;((ascii latin-iso8859-1 latin-iso8859-2
+     ;;        cyrillic-iso8859-5 greek-iso8859-7
+     ;;        latin-jisx0201 japanese-jisx0208-1978
+     ;;        chinese-gb2312 japanese-jisx0208
+     ;;        korean-ksc5601 japanese-jisx0212
+     ;;        chinese-cns11643-1 chinese-cns11643-2
+     ;;        chinese-cns11643-3 chinese-cns11643-4
+     ;;        chinese-cns11643-5 chinese-cns11643-6
+     ;;        chinese-cns11643-7)                     . iso-2022-int-1)
+     )))
 
 (defun-maybe coding-system-get (coding-system prop)
   "Extract a value from CODING-SYSTEM's property list for property PROP."