Merge gnus-6_7-tomo.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 02480f7..a386b4d 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3225,7 +3225,7 @@ forbidden in URL encoding."
 ;;;
 
 (defun gnus-article-header-presentation-method (entity situation)
-  (mime-insert-decoded-header entity nil nil default-mime-charset)
+  (mime-insert-decoded-header entity)
   )
 
 (set-alist 'mime-header-presentation-method-alist
@@ -3241,9 +3241,6 @@ forbidden in URL encoding."
     (gnus-summary-select-article nil t)
     ))
 
-(set-alist 'mime-raw-representation-type-alist
-          'gnus-original-article-mode 'binary)
-
 (set-alist 'mime-preview-quitting-method-alist
           'gnus-original-article-mode #'gnus-mime-preview-quitting-method)