X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-decode.el;h=64d935bab69a32b05c696681a840ef282fe3a760;hb=752b4a9662af2529a44b9631a6248f70a734ce1a;hp=fdb91319ab48b9cf373a46081675e72d3d16e2cc;hpb=e5b801c287295e0df6ecde6c91ae715ef8bd4f0a;p=gnus

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index fdb91319a..64d935bab 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -111,12 +111,12 @@ The defined renderer types are:
 `lynx' : using lynx;
 `html2text' : using html2text;
 `nil'  : using external viewer."
-  :type '(choice (symbol w3)
-		 (symbol w3m)
-		 (symbol links)
-		 (symbol lynx)
-		 (symbol html2text)
-		 (symbol nil)
+  :type '(choice (const w3)
+		 (const w3m)
+		 (const links)
+		 (const lynx)
+		 (const html2text)
+		 (const nil)
 		 (function))
   :version "21.3"
   :group 'mime-display)
@@ -665,8 +665,8 @@ external if displayed external."
 		  (mm-handle-set-undisplayer handle mm)))))
 	;; The function is a string to be executed.
 	(mm-insert-part handle)
-	(let* ((dir (make-temp-name
-		     (expand-file-name "emm." mm-tmp-directory)))
+	(let* ((dir (mm-make-temp-file
+		     (expand-file-name "emm." mm-tmp-directory) 'dir))
 	       (filename (or
 			  (mail-content-type-get
 			   (mm-handle-disposition handle) 'filename)
@@ -679,14 +679,13 @@ external if displayed external."
 	       (copiousoutput (assoc "copiousoutput" mime-info))
 	       file buffer)
 	  ;; We create a private sub-directory where we store our files.
-	  (make-directory dir)
 	  (set-file-modes dir 448)
 	  (if filename
 	      (setq file (expand-file-name 
 			  (gnus-map-function mm-file-name-rewrite-functions
                                              (file-name-nondirectory filename))
 			  dir))
-	    (setq file (make-temp-name (expand-file-name "mm." dir))))
+	    (setq file (mm-make-temp-file (expand-file-name "mm." dir))))
 	  (let ((coding-system-for-write mm-binary-coding-system))
 	    (write-region (point-min) (point-max) file nil 'nomesg))
 	  (message "Viewing with %s" method)
@@ -1016,9 +1015,8 @@ like underscores."
 					(file-name-nondirectory filename))))
     (setq file
 	  (read-file-name "Save MIME part to: "
-			  (expand-file-name
-			   (or filename name "")
-			   (or mm-default-directory default-directory))))
+			  (or mm-default-directory default-directory)
+			  nil nil (or filename name "")))
     (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? "
@@ -1167,7 +1165,7 @@ be determined."
     ;; (without a ton of work) is to write them
     ;; out to a file, and then create a file
     ;; specifier.
-    (let ((file (make-temp-name
+    (let ((file (mm-make-temp-file
 		 (expand-file-name "emm.xbm"
 				   mm-tmp-directory))))
       (unwind-protect