# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 743545222 0
# Node ID 7c7fa71cfd6e642b5a8fb76bcc5dae512447b1cd
# Parent  bc0af06c6e3c0a2da1b7a3c3851b2e692f527c40
(rmail-last-rmail-file): Initialize to a file name.
(rmail): Don't set rmail-last-rmail-file.

(rmail-forward): Call rmail-start-mail for new frame
even if just one window.
(rmail-start-mail): Return what mail-other-frame returned.

diff -r bc0af06c6e3c -r 7c7fa71cfd6e lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Sat Jul 24 18:42:33 1993 +0000
+++ b/lisp/mail/rmail.el	Sat Jul 24 20:20:22 1993 +0000
@@ -126,7 +126,7 @@
 (defvar rmail-last-multi-labels nil)
 (defvar rmail-last-file nil)
 (defvar rmail-last-regexp nil)
-(defvar rmail-last-rmail-file nil)
+(defvar rmail-last-rmail-file (expand-file-name "~/XMAIL"))
 
 ;;; Regexp matching the delimiter of messages in UNIX mail format
 ;;; (UNIX From lines), minus the initial ^.  Note that if you change
@@ -201,8 +201,6 @@
 					 nil nil t))))
   (or rmail-last-file
       (setq rmail-last-file (expand-file-name "~/xmail")))
-  (or rmail-last-rmail-file
-      (setq rmail-last-rmail-file (expand-file-name "~/XMAIL")))
   (let* ((file-name (expand-file-name (or file-name-arg rmail-file-name)))
 	 (existed (get-file-buffer file-name)))
     ;; Like find-file, but in the case where a buffer existed
@@ -1654,7 +1652,7 @@
 
 (defun rmail-start-mail (&rest args)
   (if rmail-mail-new-frame
-      (progn
+      (prog1
 	(apply 'mail-other-frame args)
 	(modify-frame-parameters (selected-frame)
 				 '((dedicated . t))))
@@ -1813,7 +1811,7 @@
 	;; Otherwise, use another window for the mail buffer
 	;; so that the Rmail buffer remains visible
 	;; and sending the mail will get back to it.
-	(if (funcall (if (one-window-p t)
+	(if (funcall (if (and (not rmail-mail-new-frame) (one-window-p t))
 			 (function mail)
 		       (function rmail-start-mail))
 		     nil nil subject nil nil nil
@@ -1824,10 +1822,10 @@
 				       "forwarded" t msgnum))))
 				 (current-buffer)
 				 rmail-current-message)))
-	    (save-excursion
-	      (goto-char (point-max))
-	      (forward-line 1)
-	      (insert-buffer forward-buffer)))))))
+	  (save-excursion
+	    (goto-char (point-max))
+	    (forward-line 1)
+	    (insert-buffer forward-buffer)))))))
 
 (defun rmail-resend (address &optional from comment mail-alias-file)
   "Resend current message to ADDRESSES.