From 97a4045db3b6ea2ba8223eec76a7c4bae28928d2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 23 Jan 2004 01:09:41 +0000 Subject: [PATCH] Synch to No Gnus 200401230105. --- lisp/ChangeLog | 5 +++++ lisp/mm-util.el | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa0134c..73fbacf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-01-23 Jesper Harder + + * mm-util.el (mm-charset-synonym-alist): Add ks_c_5601-1987. + Remove obsolete entries for big5 and gb2312. + 2004-01-22 Kevin Greiner * gnus-sum.el (gnus-adjust-marks): Avoid splicing null INTO the diff --git a/lisp/mm-util.el b/lisp/mm-util.el index e41f477..b068ff4 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -134,15 +134,9 @@ In XEmacs, also return non-nil if CS is a coding system object." (defvar mm-charset-synonym-alist `( - ;; Perfectly fine? A valid MIME name, anyhow. - ,@(unless (mm-coding-system-p 'big5) - '((big5 . cn-big5))) ;; Not in XEmacs, but it's not a proper MIME charset anyhow. ,@(unless (mm-coding-system-p 'x-ctext) '((x-ctext . ctext))) - ;; Apparently not defined in Emacs 20, but is a valid MIME name. - ,@(unless (mm-coding-system-p 'gb2312) - '((gb2312 . cn-gb-2312))) ;; ISO-8859-15 is very similar to ISO-8859-1. But it's _different_! ,@(unless (mm-coding-system-p 'iso-8859-15) '((iso-8859-15 . iso-8859-1))) @@ -161,6 +155,11 @@ In XEmacs, also return non-nil if CS is a coding system object." ,@(if (and (not (mm-coding-system-p 'windows-1250)) (mm-coding-system-p 'cp1250)) '((windows-1250 . cp1250))) + ;; A Microsoft misunderstanding. + ,@(unless (mm-coding-system-p 'ks_c_5601-1987) + (if (mm-coding-system-p 'cp949) + '((ks_c_5601-1987 . cp949)) + '((ks_c_5601-1987 . euc-kr)))) ) "A mapping from invalid charset names to the real charset names.") -- 1.7.10.4