(gnus-article-part-wrapper): Work with the nearest part if it is not specified.

[gnus] / lisp / mm-extern.el

diff --git a/lisp/mm-extern.el b/lisp/mm-extern.el
index b736374..342ea9e 100644 (file)
--- a/lisp/mm-extern.el
+++ b/lisp/mm-extern.el
@@ -1,7 +1,7 @@
 ;;; mm-extern.el --- showing message/external-body
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
@@ -97,7 +97,7 @@
         (subject (or (cdr (assq 'subject params)) "none"))
         (buf (current-buffer))
         info)
-    (if (y-or-n-p (format "Send a request message to %s?" server))
+    (if (y-or-n-p (format "Send a request message to %s? " server))
        (save-window-excursion
          (message-mail server subject)
          (message-goto-body)
@@ -157,25 +157,11 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing."
     (save-excursion
       (save-restriction
        (narrow-to-region (point) (point))
-       (let* ((type (regexp-quote
-                     (mm-handle-media-type (mm-handle-cache handle))))
-              ;; Force the part to be displayed (but if there is no
-              ;; method to display, a user will be prompted to save).
-              ;; See `gnus-mime-display-single'.
-              (mm-inline-override-types nil)
-              (mm-attachment-override-types
-               (cons type mm-attachment-override-types))
-              (mm-automatic-display (cons type mm-automatic-display))
-              (mm-automatic-external-display
-               (cons type mm-automatic-external-display))
-              ;; Suppress adding of button to the cached part.
-              (gnus-inhibit-mime-unbuttonizing nil))
-         (gnus-display-mime (mm-handle-cache handle)))
-       ;; Move undisplayer added to the cached handle to the parent.
-       (mm-handle-set-undisplayer
-        handle
-        (mm-handle-undisplayer (mm-handle-cache handle)))
-       (mm-handle-set-undisplayer (mm-handle-cache handle) nil)))))
+       (mm-display-part (mm-handle-cache handle))))
+    ;; Move undisplayer added to the cached handle to the parent.
+    (mm-handle-set-undisplayer
+     handle (mm-handle-undisplayer (mm-handle-cache handle)))
+    (mm-handle-set-undisplayer (mm-handle-cache handle) nil)))
 
 (provide 'mm-extern)