diff options
| author | Miles Bader <miles@gnu.org> | 2006-07-16 22:19:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-07-16 22:19:06 +0000 |
| commit | b44409c97d2332b7f1ebe01caee02fc270165ef3 (patch) | |
| tree | f94568f0f84f687efa101745b6432ca01ffeab88 /lisp/gnus | |
| parent | 072cb54a86df049efc2eb6669b1427807a058c2b (diff) | |
| download | emacs-b44409c97d2332b7f1ebe01caee02fc270165ef3.tar.gz | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 115)
- Update from CVS
2006-07-16 NAKAJI Hiroyuki <nakaji@heimat.jp> (tiny change)
* lisp/gnus/mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-353
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 825a8bce003..e443056e034 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2006-07-16 NAKAJI Hiroyuki <nakaji@heimat.jp> (tiny change) + + * mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932. + 2006-07-14 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * gnus-start.el (gnus-subscribe-options-newsgroup-method): Doc fix. diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 634d1f66675..26a1bf23e84 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -204,19 +204,19 @@ the alias. Else windows-NUMBER is used." `( ;; Not in XEmacs, but it's not a proper MIME charset anyhow. ,@(unless (mm-coding-system-p 'x-ctext) - '((x-ctext . ctext))) + '((x-ctext . ctext))) ;; 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))) + '((iso-8859-15 . iso-8859-1))) ;; BIG-5HKSCS is similar to, but different than, BIG-5. ,@(unless (mm-coding-system-p 'big5-hkscs) '((big5-hkscs . big5))) ;; Windows-1252 is actually a superset of Latin-1. See also ;; `gnus-article-dumbquotes-map'. ,@(unless (mm-coding-system-p 'windows-1252) - (if (mm-coding-system-p 'cp1252) - '((windows-1252 . cp1252)) - '((windows-1252 . iso-8859-1)))) + (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. @@ -232,6 +232,10 @@ the alias. Else windows-NUMBER is used." (if (mm-coding-system-p 'cp949) '((ks_c_5601-1987 . cp949)) '((ks_c_5601-1987 . euc-kr)))) + ;; Windows-31J is Windows Codepage 932. + ,@(if (and (not (mm-coding-system-p 'windows-31j)) + (mm-coding-system-p 'cp932)) + '((windows-31j . cp932))) ) "A mapping from unknown or invalid charset names to the real charset names.") |