X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-decode.el;h=7562e57ca8fd3b10c6652d65fac245ef6bf3190f;hb=d0d9cda9317efcab864737efe1a255fdcdcb19c4;hp=01a7b751f3aeafac49c877ac8b113dcca3bfdc4c;hpb=c9dbb414beef4f1381524ee576f6f58fc61bc53a;p=gnus

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 01a7b751f..7562e57ca 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1248,9 +1248,13 @@ PROMPT overrides the default one used to ask user for a file name."
       (setq filename (gnus-map-function mm-file-name-rewrite-functions
 					(file-name-nondirectory filename))))
     (setq file
-          (read-file-name (or prompt "Save MIME part to: ")
+          (read-file-name (or prompt
+			      (format "Save MIME part to (default %s): "
+				      (or filename "")))
                           (or mm-default-directory default-directory)
-                          nil nil (or filename "")))
+			  (or filename "")))
+    (when (file-directory-p file)
+      (setq file (expand-file-name filename file)))
     (setq mm-default-directory (file-name-directory file))
     (and (or (not (file-exists-p file))
 	     (yes-or-no-p (format "File %s already exists; overwrite? "
@@ -1319,11 +1323,11 @@ Use CMD as the process."
   "Display HANDLE using METHOD."
   (let* ((type (mm-handle-media-type handle))
 	 (methods
-	  (mapcar (lambda (i) (list (cdr (assoc 'viewer i))))
+	  (mapcar (lambda (i) (cdr (assoc 'viewer i)))
 		  (mailcap-mime-info type 'all)))
 	 (method (let ((minibuffer-local-completion-map
 			mm-viewer-completion-map))
-		   (completing-read "Viewer: " methods))))
+		   (gnus-completing-read "Viewer" methods))))
     (when (string= method "")
       (error "No method given"))
     (if (string-match "^[^% \t]+$" method)
@@ -1475,7 +1479,7 @@ be determined."
    ;; Handle XEmacs
    ((fboundp 'valid-image-instantiator-format-p)
     (valid-image-instantiator-format-p format))
-   ;; Handle Emacs 21
+   ;; Handle Emacs
    ((fboundp 'image-type-available-p)
     (and (display-graphic-p)
 	 (image-type-available-p format)))