From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Thu, 7 Oct 2010 19:31:55 +0000 (+0200)
Subject: * mm-decode.el (mm-save-part): If given a non-directory result, expand
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=bbcf07fb55c6e66da45e0c4011bd068aa2b08260

* mm-decode.el (mm-save-part): If given a non-directory result, expand
the file name before using to avoid setting mm-default-directory to
nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37bd6c979..90285eabc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* mm-decode.el (mm-save-part): If given a non-directory result, expand
+	the file name before using to avoid setting mm-default-directory to
+	nil.
+
 	* gnus-start.el (gnus-get-unread-articles): Require gnus-agent before
 	bidning gnus-agent variables.
 
diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 70b735a70..1006c850a 100644
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -1258,8 +1258,10 @@ PROMPT overrides the default one used to ask user for a file name."
 				      (or filename "")))
                           (or mm-default-directory default-directory)
 			  (or filename "")))
-    (when (file-directory-p file)
-      (setq file (expand-file-name filename file)))
+    (if (file-directory-p file)
+	(setq file (expand-file-name filename file))
+      (setq file (expand-file-name
+		  file (or mm-default-directory default-directory))))
     (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? "