2001-11-01 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-util.el (mm-charset-synonym-alist): Revert (some).

2 files changed, 21 insertions, 16 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 14138f18820..9cef3e87de2 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,4 +1,8 @@
-2001-10-30 ShengHuo ZHU  <zsh@cs.rochester.edu>
+2001-11-01  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+        * mm-util.el (mm-charset-synonym-alist): Revert (some).
+
+2001-10-30  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
         * mm-util.el, nnultimate.el, nnweb.el, nnslashdot.el: Sync with
         the Gnus CVS.
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 69823c43d1c..35229591c7d 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -108,28 +108,29 @@
 (defvar mm-charset-synonym-alist
   `(
     ;; Perfectly fine?  A valid MIME name, anyhow.
-    ,(unless (mm-coding-system-p 'big5)
-       '(big5 . cn-big5))
+    ,@(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))
+    ,@(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))
+    ,@(unless (mm-coding-system-p 'gb2312)
+       '((gb2312 . cn-gb-2312)))
+    ;; ISO-8859-15 is very similar to ISO-8859-1.
+    ,@(unless (mm-coding-system-p 'iso-8859-15) ; Emacs 21 defines it.
+       '((iso-8859-15 . iso-8859-1)))
     ;; Windows-1252 is actually a superset of Latin-1.  See also
     ;; `gnus-article-dumbquotes-map'.
-    ;;,(unless (mm-coding-system-p 'windows-1252)       
-                                        ; should be defined eventually
-    ;;  '(windows-1252 . iso-8859-1))
-    ;; ISO-8859-15 is very similar to ISO-8859-1.
-    ;;,(unless (mm-coding-system-p 'iso-8859-15) ; Emacs 21 defines it.
-    ;;   '(iso-8859-15 . iso-8859-1))
+    ,@(unless (mm-coding-system-p 'windows-1252)        
+       (if (mm-coding-system-p 'cp1252)
+           '((windows-1252 . cp1252))
+         '((windows-1252 . iso-8859-1))))
     ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
     ;; Outlook users in Czech republic. Use this to allow reading of their
     ;; e-mails. cp1250 should be defined by M-x codepage-setup.
-    ;;,(unless (mm-coding-system-p 'windows-1250)       
-                                        ; should be defined eventually
-    ;;  '(windows-1250 . cp1250))
+    ,@(if (and (not (mm-coding-system-p 'windows-1250))
+               (mm-coding-system-p 'cp1250))
+          '((windows-1250 . cp1250)))
     )
   "A mapping from invalid charset names to the real charset names.")