From c69dd154133fd41b6d6ea9a9db0f959b3c743a40 Mon Sep 17 00:00:00 2001 From: dmaus Date: Sat, 18 Feb 2012 12:30:45 +0000 Subject: [PATCH] Fix incorrect usage of `read-file-name', follow-up * wl-summary.el (wl-summary-save) (wl-summary-target-mark-uudecode): Fix incorrect usage of `read-file-name'. Follow-up of the previous fix in wl-mime.el. --- wl/ChangeLog | 6 ++++++ wl/wl-summary.el | 12 +++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 0dcbec9..9fa8833 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,9 @@ +2012-02-18 David Maus + + * wl-summary.el (wl-summary-save) + (wl-summary-target-mark-uudecode): Fix incorrect usage of + `read-file-name'. + 2012-02-12 David Maus * wl-mime.el (wl-mime-save-content): Fix incorrect usage of diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 857ee19..e0db0b2 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -4779,13 +4779,10 @@ If ARG is numeric number, decode message as following: (setq wl-save-dir wl-temporary-file-directory)) (if num (save-excursion - (setq filename (expand-file-name - (concat (number-to-string num) - wl-summary-save-file-suffix) - wl-save-dir)) + (setq filename (concat (number-to-string num) wl-summary-save-file-suffix)) (when (or (null arg) (file-exists-p filename)) - (setq filename (read-file-name "Save to file: " filename))) + (setq filename (expand-file-name (read-file-name "Save to file: " wl-save-dir nil nil filename)))) (wl-summary-set-message-buffer-or-redisplay) (set-buffer (wl-message-get-original-buffer)) (when (or arg @@ -4985,10 +4982,7 @@ If ARG is numeric number, decode message as following: (unwind-protect (let ((decode-dir wl-temporary-file-directory)) (if (not wl-prog-uudecode-no-stdout-option) - (setq filename (read-file-name "Save to file: " - (expand-file-name - (elmo-safe-filename filename) - wl-temporary-file-directory))) + (setq filename (expand-file-name (read-file-name "Save to file: " wl-temporary-file-directory nil nil (elmo-safe-filename)))) (setq decode-dir (wl-read-directory-name "Save to directory: " wl-temporary-file-directory)) -- 1.7.10.4