From: yamaoka Date: Wed, 26 Jun 2002 01:08:48 +0000 (+0000) Subject: * mcs-e20.el (charsets-mime-charset-alist): Remove nil's from the default X-Git-Tag: apel-10_4~6 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b465e968b9c0dcb7a2e6a48c70d45bf74442dfd6;p=elisp%2Fapel.git * mcs-e20.el (charsets-mime-charset-alist): Remove nil's from the default value. * mcs-xm.el (charsets-mime-charset-alist): Ditto. --- diff --git a/ChangeLog b/ChangeLog index be07e2e..c92fa36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-06-26 Katsumi Yamaoka + + * mcs-e20.el (charsets-mime-charset-alist): Remove nil's from the + default value. + * mcs-xm.el (charsets-mime-charset-alist): Ditto. + 2002-06-21 Katsumi Yamaoka * mcs-e20.el (charsets-mime-charset-alist): Add Latin8 and Latin9 diff --git a/mcs-e20.el b/mcs-e20.el index 9de5f5f..94ad2ed 100644 --- a/mcs-e20.el +++ b/mcs-e20.el @@ -66,48 +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) - ,(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) - )) + (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." diff --git a/mcs-xm.el b/mcs-xm.el index 9e568c1..6f4c7b8 100644 --- a/mcs-xm.el +++ b/mcs-xm.el @@ -103,69 +103,71 @@ (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) - ,(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)) - ,(if (featurep 'utf-2000) - '((ascii latin-jisx0201 - japanese-jisx0208-1978 - japanese-jisx0208 - japanese-jisx0208-1990) . iso-2022-jp) - '((ascii latin-jisx0201 - japanese-jisx0208-1978 japanese-jisx0208) - . iso-2022-jp)) - ,(if (featurep 'utf-2000) - '((ascii latin-jisx0201 - japanese-jisx0208-1978 - japanese-jisx0208 - japanese-jisx0208-1990 - japanese-jisx0213-1 - japanese-jisx0213-2) . iso-2022-jp-3) - '((ascii latin-jisx0201 - japanese-jisx0208-1978 japanese-jisx0208 - japanese-jisx0213-1 - japanese-jisx0213-2) . iso-2022-jp-3)) - ,(if (featurep 'utf-2000) - '((ascii latin-jisx0201 katakana-jisx0201 - japanese-jisx0208-1990) . shift_jis) - '((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-xtis) . tis-620) - ,(if (featurep 'utf-2000) - '((ascii latin-jisx0201 latin-iso8859-1 - greek-iso8859-7 - japanese-jisx0208-1978 japanese-jisx0208 - japanese-jisx0208-1990 - japanese-jisx0212 - chinese-gb2312 - korean-ksc5601) . iso-2022-jp-2) - '((ascii latin-jisx0201 latin-iso8859-1 - greek-iso8859-7 - japanese-jisx0208-1978 japanese-jisx0208 - japanese-jisx0212 - chinese-gb2312 - korean-ksc5601) . 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) - )) + (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)) + ,(if (featurep 'utf-2000) + '((ascii latin-jisx0201 + japanese-jisx0208-1978 + japanese-jisx0208 + japanese-jisx0208-1990) . iso-2022-jp) + '((ascii latin-jisx0201 + japanese-jisx0208-1978 japanese-jisx0208) + . iso-2022-jp)) + ,(if (featurep 'utf-2000) + '((ascii latin-jisx0201 + japanese-jisx0208-1978 + japanese-jisx0208 + japanese-jisx0208-1990 + japanese-jisx0213-1 + japanese-jisx0213-2) . iso-2022-jp-3) + '((ascii latin-jisx0201 + japanese-jisx0208-1978 japanese-jisx0208 + japanese-jisx0213-1 + japanese-jisx0213-2) . iso-2022-jp-3)) + ,(if (featurep 'utf-2000) + '((ascii latin-jisx0201 katakana-jisx0201 + japanese-jisx0208-1990) . shift_jis) + '((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-xtis) . tis-620) + ,(if (featurep 'utf-2000) + '((ascii latin-jisx0201 latin-iso8859-1 + greek-iso8859-7 + japanese-jisx0208-1978 japanese-jisx0208 + japanese-jisx0208-1990 + japanese-jisx0212 + chinese-gb2312 + korean-ksc5601) . iso-2022-jp-2) + '((ascii latin-jisx0201 latin-iso8859-1 + greek-iso8859-7 + japanese-jisx0208-1978 japanese-jisx0208 + japanese-jisx0212 + chinese-gb2312 + korean-ksc5601) . 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) + ))) (defun coding-system-to-mime-charset (coding-system)