Show
Ignore:
Timestamp:
07/29/06 07:48:34 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/gnus/mm-util.el

    r4098 r4131  
    205205    ;; Not in XEmacs, but it's not a proper MIME charset anyhow. 
    206206    ,@(unless (mm-coding-system-p 'x-ctext) 
    207        '((x-ctext . ctext))) 
     207       '((x-ctext . ctext))) 
    208208    ;; ISO-8859-15 is very similar to ISO-8859-1.  But it's _different_! 
    209209    ,@(unless (mm-coding-system-p 'iso-8859-15) 
    210        '((iso-8859-15 . iso-8859-1))) 
     210       '((iso-8859-15 . iso-8859-1))) 
    211211    ;; BIG-5HKSCS is similar to, but different than, BIG-5. 
    212212    ,@(unless (mm-coding-system-p 'big5-hkscs) 
     
    215215    ;; `gnus-article-dumbquotes-map'. 
    216216    ,@(unless (mm-coding-system-p 'windows-1252) 
    217        (if (mm-coding-system-p 'cp1252) 
    218            '((windows-1252 . cp1252)) 
    219          '((windows-1252 . iso-8859-1)))) 
     217       (if (mm-coding-system-p 'cp1252) 
     218            '((windows-1252 . cp1252)) 
     219          '((windows-1252 . iso-8859-1)))) 
    220220    ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft 
    221221    ;; Outlook users in Czech republic. Use this to allow reading of their 
     
    233233            '((ks_c_5601-1987 . cp949)) 
    234234          '((ks_c_5601-1987 . euc-kr)))) 
     235    ;; Windows-31J is Windows Codepage 932. 
     236    ,@(if (and (not (mm-coding-system-p 'windows-31j)) 
     237               (mm-coding-system-p 'cp932)) 
     238          '((windows-31j . cp932))) 
    235239    ) 
    236240  "A mapping from unknown or invalid charset names to the real charset names.")