(rmail-output-to-rmail-file): If just a dir is specified,

use default name in specified dir.

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 90aedd8f62ad846ff0589079012c6784847aa0bb..fa7c921de655359868e41e6dc06093f54da1b9f8 100644 (file)
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -61,16 +61,19 @@ starting with the current one.  Deleted messages are skipped and don't count."
             ;; If not suggestions, use same file as last time.
             (or answer rmail-last-rmail-file))))
      (list (setq rmail-last-rmail-file
-                (expand-file-name
-                 (or
-                  (read-file-name
-                   (concat "Output message to Rmail file: (default "
-                           (file-name-nondirectory default-file)
-                           ") ")
-                   (file-name-directory default-file)
-                   default-file)
-                  default-file)
-                 (file-name-directory default-file)))
+                (let ((read-file
+                       (read-file-name
+                        (concat "Output message to Rmail file: (default "
+                                (file-name-nondirectory default-file)
+                                ") ")
+                        (file-name-directory default-file)
+                        default-file)))
+                  (if (file-directory-p read-file)
+                      (expand-file-name (file-name-nondirectory default-file)
+                                        read-file)
+                    (expand-file-name
+                     (or read-file default-file)
+                     (file-name-directory default-file)))))
           (prefix-numeric-value current-prefix-arg))))
   (or count (setq count 1))
   (setq file-name