diff options
| author | ShengHuo ZHU <zsh@cs.rochester.edu> | 2001-11-01 15:29:49 +0000 |
|---|---|---|
| committer | ShengHuo ZHU <zsh@cs.rochester.edu> | 2001-11-01 15:29:49 +0000 |
| commit | 72eb5fc741e1b76818f4f405a6b0c1d087a6287c (patch) | |
| tree | 2ea5634f42a8be77d0b18bcdfca9433172a61f4e /lisp/gnus/mm-util.el | |
| parent | 8b8bd9c6eda85dd4c496dc0e4f70af28b13dbcbb (diff) | |
| download | emacs-72eb5fc741e1b76818f4f405a6b0c1d087a6287c.tar.gz emacs-72eb5fc741e1b76818f4f405a6b0c1d087a6287c.tar.bz2 emacs-72eb5fc741e1b76818f4f405a6b0c1d087a6287c.zip | |
2001-11-01 ShengHuo ZHU <zsh@cs.rochester.edu>
* mm-util.el (mm-charset-synonym-alist): Revert (some).
Diffstat (limited to 'lisp/gnus/mm-util.el')
| -rw-r--r-- | lisp/gnus/mm-util.el | 31 |
1 files changed, 16 insertions, 15 deletions
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.") |