Importing pgnus-0.84

[elisp/gnus.git-] / lisp / mm-bodies.el

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 90de90f..79afd06 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -45,7 +45,7 @@
     (iso-8859-3 . quoted-printable)
     (iso-8859-4 . quoted-printable)
     (iso-8859-5 . base64)
-    (koi8-r . base64)
+    (koi8-r . 8bit)
     (iso-8859-7 . quoted-printable)
     (iso-8859-8 . quoted-printable)
     (iso-8859-9 . quoted-printable)
@@ -54,7 +54,7 @@
     (gb2312 . base64)
     (cn-gb . base64)
     (cn-gb-2312 . base64)
-    (euc-kr . base64)
+    (euc-kr . 8bit)
     (iso-2022-jp-2 . base64)
     (iso-2022-int-1 . base64))
   "Alist of MIME charsets to encodings.
@@ -122,7 +122,7 @@ If no encoding was done, nil is returned."
      ((eq charset mail-parse-charset)
       bits)
      (t
-      (let ((encoding (or (cdr (assq charset mm-body-charset-encoding-alist ))
+      (let ((encoding (or (cdr (assq charset mm-body-charset-encoding-alist))
                          'quoted-printable)))
        (mm-encode-content-transfer-encoding encoding "text/plain")
        encoding)))))
@@ -166,7 +166,7 @@ If no encoding was done, nil is returned."
            )
           ((null encoding)
            )
-          ((eq encoding 'x-uuencode)
+          ((memq encoding '(x-uuencode x-uue))
            (funcall mm-uu-decode-function (point-min) (point-max)))
           ((eq encoding 'x-binhex)
            (funcall mm-uu-binhex-decode-function (point-min) (point-max)))
@@ -178,7 +178,7 @@ If no encoding was done, nil is returned."
         (message "Error while decoding: %s" error)
         nil))
     (when (and
-          (memq encoding '(base64 x-uuencode x-binhex))
+          (memq encoding '(base64 x-uuencode x-uue x-binhex))
           (equal type "text/plain"))
       (goto-char (point-min))
       (while (search-forward "\r\n" nil t)