* gnus-sum.el (gnus-summary-preview-mime-message): Always select the article

before previewing. Abolish prefix arg.
* gnus-art.el (gnus-mime-preview-quitting-method): re-select the article
without reservation.
(gnus-article-display-mime-message): Show all headers if
`gnus-have-all-headers' the local var of summary buffer is non-nil.

diff --git a/ChangeLog b/ChangeLog
index b456886..2f09f1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1998-12-28  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * lisp/gnus-sum.el (gnus-summary-preview-mime-message): Always
+       select the article before previewing. Abolish prefix arg.
+
+       * lisp/gnus-art.el (gnus-mime-preview-quitting-method): re-select
+       the article without reservation.
+       (gnus-article-display-mime-message): Show all headers if
+       `gnus-have-all-headers' the local var of summary buffer is non-nil.
+
 1998-12-25  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (gnus-article-check-buffer): Rewrite (checking

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a409e50..10c0476 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2215,12 +2215,16 @@ 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)))
+  (let (charset all-headers)
+    (with-current-buffer gnus-summary-buffer
+      (setq charset default-mime-charset
+           all-headers gnus-have-all-headers))
     (make-local-variable 'default-mime-charset)
     (setq default-mime-charset charset)
     (mime-display-message mime-message-structure
                          gnus-article-buffer nil gnus-article-mode-map)
+    (when all-headers
+      (gnus-article-hide-headers nil -1))
     (make-local-variable 'default-mime-charset)
     (setq default-mime-charset charset)
     )
@@ -4191,13 +4195,10 @@ For example:
           #'gnus-article-header-presentation-method)
 
 (defun gnus-mime-preview-quitting-method ()
-  (if gnus-show-mime
-      (gnus-article-show-summary)
-    (mime-preview-kill-buffer)
-    (delete-other-windows)
-    (gnus-article-show-summary)
-    (gnus-summary-select-article nil t)
-    ))
+  (mime-preview-kill-buffer)
+  (delete-other-windows)
+  (gnus-article-show-summary)
+  (gnus-summary-select-article gnus-show-all-headers t))
 
 (set-alist 'mime-preview-quitting-method-alist
           'gnus-original-article-mode #'gnus-mime-preview-quitting-method)

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 05df22f..41a469f 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5349,16 +5349,13 @@ The state which existed when entering the ephemeral is reset."
       (gnus-summary-recenter)
       (gnus-summary-position-point))))
 
-(defun gnus-summary-preview-mime-message (arg)
+(defun gnus-summary-preview-mime-message ()
   "MIME decode and play this message."
-  (interactive "P")
-  (or gnus-show-mime
-      (let ((gnus-break-pages nil)
-           (gnus-show-mime t))
-       (gnus-summary-select-article t t)
-       ))
-  (select-window (get-buffer-window gnus-article-buffer))
-  )
+  (interactive)
+  (let ((gnus-break-pages nil)
+       (gnus-show-mime t))
+    (gnus-summary-select-article gnus-show-all-headers t))
+  (select-window (get-buffer-window gnus-article-buffer)))
 
 ;;; Dead summaries.
 
@@ -7017,7 +7014,8 @@ If ARG is a negative number, hide the unwanted header lines."
 If ARG is a positive number, turn MIME processing on."
   (interactive "P")
   (setq gnus-show-mime
-       (if (null arg) (not gnus-show-mime)
+       (if (null arg)
+           (not gnus-show-mime)
          (> (prefix-numeric-value arg) 0)))
   (gnus-summary-select-article t 'force))