aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-10-12 11:19:01 +0000
committerDave Love2000-10-12 11:19:01 +0000
commitd1a7bc9359e658af9b91cb0986876f33e7aac5db (patch)
treebf08dec2674de9888a19d9eb8b748f5ebfa0f40f
parent558f409e006a1d69040ff6a1b5d59d1642bc6934 (diff)
downloademacs-d1a7bc9359e658af9b91cb0986876f33e7aac5db.tar.gz
emacs-d1a7bc9359e658af9b91cb0986876f33e7aac5db.zip
(mm-charset-synonym-alist): Add windows-1252.
-rw-r--r--lisp/gnus/mm-util.el11
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index aa70484d8aa..bb4ae3716c4 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -41,6 +41,8 @@
41 (iso-8859-7 greek-iso8859-7) 41 (iso-8859-7 greek-iso8859-7)
42 (iso-8859-8 hebrew-iso8859-8) 42 (iso-8859-8 hebrew-iso8859-8)
43 (iso-8859-9 latin-iso8859-9) 43 (iso-8859-9 latin-iso8859-9)
44 (iso-8859-14 latin-iso8859-14)
45 (iso-8859-15 latin-iso8859-15)
44 (viscii vietnamese-viscii-lower) 46 (viscii vietnamese-viscii-lower)
45 (iso-2022-jp latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978) 47 (iso-2022-jp latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978)
46 (euc-kr korean-ksc5601) 48 (euc-kr korean-ksc5601)
@@ -121,8 +123,12 @@
121 (setq mm-coding-system-list (mm-coding-system-list)))) 123 (setq mm-coding-system-list (mm-coding-system-list))))
122 124
123(defvar mm-charset-synonym-alist 125(defvar mm-charset-synonym-alist
124 '((big5 . cn-big5) 126 `((big5 . cn-big5)
125 (gb2312 . cn-gb-2312) 127 (gb2312 . cn-gb-2312)
128 ;; Windows-1252 is actually a superset of Latin-1. See also
129 ;; `gnus-article-dumbquotes-map'.
130 (unless (mm-coding-system-p 'windows-1252) ; should be defined eventually
131 (windows-1252 . iso-8859-1))
126 (x-ctext . ctext)) 132 (x-ctext . ctext))
127 "A mapping from invalid charset names to the real charset names.") 133 "A mapping from invalid charset names to the real charset names.")
128 134
@@ -264,7 +270,8 @@ If the charset is `composition', return the actual one."
264 270
265(defun mm-mime-charset (charset) 271(defun mm-mime-charset (charset)
266 "Return the MIME charset corresponding to the MULE CHARSET." 272 "Return the MIME charset corresponding to the MULE CHARSET."
267 (if (and (fboundp 'coding-system-get) (fboundp 'get-charset-property)) 273 (if (and (fboundp 'coding-system-get)
274 (fboundp 'get-charset-property))
268 ;; This exists in Emacs 20. 275 ;; This exists in Emacs 20.
269 (or 276 (or
270 (and (mm-preferred-coding-system charset) 277 (and (mm-preferred-coding-system charset)