diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-07-24 20:20:22 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-07-24 20:20:22 +0000 |
| commit | 7e73564180872102f84ee0879ef1d66b1c1bc36f (patch) | |
| tree | 30a058b3a934913fd325302740b957985e24ff52 /lisp | |
| parent | 3a0b67d10bdfde2f13086edd03e1b86221fa0f29 (diff) | |
| download | emacs-7e73564180872102f84ee0879ef1d66b1c1bc36f.tar.gz | |
(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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mail/rmail.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index afdf9cb44ec..e70161d507f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -126,7 +126,7 @@ Called with region narrowed to unformatted header.") (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 @@ that file, but does not copy any new mail into the file." 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 @@ Deleted messages stay in the file until the \\[rmail-expunge] command is given." (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 @@ see the documentation of `rmail-resend'." ;; 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 @@ see the documentation of `rmail-resend'." "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. |