Importing Pterodactyl Gnus v0.86.

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

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index b81c78b..8be8603 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -65,11 +65,21 @@
            (url-standalone-mode t)
            (url-current-object
             (url-generic-parse-url (format "cid:%s" (mm-handle-id handle))))
-           (width (window-width)))
+           (width (window-width))
+           (charset (mail-content-type-get
+                     (mm-handle-type handle) 'charset)))
        (save-excursion
          (insert text)
          (save-restriction
            (narrow-to-region b (point))
+           (goto-char (point-min))
+           (if (or (re-search-forward w3-meta-content-type-charset-regexp nil t)
+                   (re-search-forward w3-meta-charset-content-type-regexp nil t))
+               (setq charset (w3-coding-system-for-mime-charset 
+                              (buffer-substring-no-properties 
+                               (match-beginning 2) 
+                               (match-end 2)))))
+           (mm-decode-body charset)
            (save-window-excursion
              (let ((w3-strict-width width)
                    (url-standalone-mode t))