# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 898617188 0
# Node ID 52a3a023a9be71ec5d4e82af72b9148ef04698df
# Parent  892421e6b7b4629a4408e8867a1266eb993a1038
(rmail-output): Handle directories properly
in suggestions fro the alist.

diff -r 892421e6b7b4 -r 52a3a023a9be lisp/mail/rmailout.el
--- a/lisp/mail/rmailout.el	Tue Jun 23 15:51:47 1998 +0000
+++ b/lisp/mail/rmailout.el	Tue Jun 23 15:53:08 1998 +0000
@@ -234,7 +234,7 @@
 		 (if (re-search-forward (car (car tail)) nil t)
 		     (setq answer (eval (cdr (car tail)))))
 		 (setq tail (cdr tail))))
-	     ;; If not suggestions, use same file as last time.
+	     ;; If no suggestion, use same file as last time.
 	     (or answer rmail-default-file))))
      (list (setq rmail-default-file
 		 (let ((read-file
@@ -242,13 +242,13 @@
 			 (concat "Output message to Unix mail file: (default "
 				 (file-name-nondirectory default-file)
 				 ") ")
-			 (file-name-directory default-file)
-			 default-file)))
+			 (file-name-directory (expand-file-name default-file))
+			 (expand-file-name 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)
+		      (or read-file (file-name-nondirectory default-file))
 		      (file-name-directory default-file)))))
 	   (prefix-numeric-value current-prefix-arg))))
   (or count (setq count 1))