Sync up with gnus-6_9.

[elisp/gnus.git-] / lisp / gnus-art.el

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3504acc..3d5aca3 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1968,15 +1968,11 @@ commands:
 (defun gnus-article-display-mime-message ()
   "Article display method for MIME message."
   ;; called from `gnus-original-article-buffer'.
-  (let ((charset (with-current-buffer gnus-summary-buffer
-                  default-mime-charset)))
-    (make-local-variable 'default-mime-charset)
-    (setq default-mime-charset charset)
+  (let ((default-mime-charset (save-excursion
+                               (set-buffer gnus-summary-buffer)
+                               default-mime-charset)))
     (mime-display-message mime-message-structure
-                         gnus-article-buffer nil gnus-article-mode-map)
-    (make-local-variable 'default-mime-charset)
-    (setq default-mime-charset charset)
-    )
+                         gnus-article-buffer nil gnus-article-mode-map))
   ;; `mime-display-message' changes current buffer to `gnus-article-buffer'.
   (make-local-variable 'mime-button-mother-dispatcher)
   (setq mime-button-mother-dispatcher