(article-de-quoted-unreadable)

(article-de-base64-unreadable): Fold search case
rather than downcasing string.  Apply mm-charset-to-coding-system
to arg of quoted-printable-decode-region.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 4bc1e3fe708e67e443dc365f3e1d50df096f33a0..d9a32de5528c8a765515dac9bc3ed75e6b834de4 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1529,9 +1529,11 @@ or not."
       (unless charset 
        (setq charset gnus-newsgroup-charset))
       (when (or force
-               (and type (string-match "quoted-printable" (downcase type))))
+               (and type (let ((case-fold-search t))
+                           (string-match "quoted-printable" type))))
        (article-goto-body)
-       (quoted-printable-decode-region (point) (point-max) charset)))))
+       (quoted-printable-decode-region
+        (point) (point-max) (mm-charset-to-coding-system charset))))))
 
 (defun article-de-base64-unreadable (&optional force)
   "Translate a base64 article.
@@ -1554,13 +1556,14 @@ If FORCE, decode the article whether it is marked as base64 not."
       (unless charset 
        (setq charset gnus-newsgroup-charset))
       (when (or force
-               (and type (string-match "base64" (downcase type))))
+               (and type (let ((case-fold-search t))
+                           (string-match "base64" type))))
        (article-goto-body)
        (save-restriction
          (narrow-to-region (point) (point-max))
          (base64-decode-region (point-min) (point-max))
-         (if (mm-coding-system-p charset)
-             (mm-decode-coding-region (point-min) (point-max) charset)))))))
+         (mm-decode-coding-region
+          (point-min) (point-max) (mm-charset-to-coding-system charset)))))))
 
 (eval-when-compile
   (require 'rfc1843))