From 1db2d450cbf0bfcb78edd5670a5d902c043edef2 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 12 Sep 2005 21:58:21 +0000 Subject: 2005-09-13 Chong Yidong * mail/sendmail.el (mail): Use new buffer if `noerase' argument is `new'. --- lisp/mail/sendmail.el | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'lisp/mail') diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index f5c34ff80ca..32328a33177 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1591,8 +1591,13 @@ is inserted. The normal hook `mail-setup-hook' is run after the message is initialized. It can add more default fields to the message. -When calling from a program, the first argument if non-nil says -not to erase the existing contents of the `*mail*' buffer. +The first argument, NOERASE, determines what to do when there is +an existing modified `*mail*' buffer. If NOERASE is nil, the +existing mail buffer is used, and the user is prompted whether to +keep the old contents or to erase them. If NOERASE has the value +`new', a new mail buffer will be created instead of using the old +one. Any other non-nil value means to always select the old +buffer without erasing the contents. The second through fifth arguments, TO, SUBJECT, IN-REPLY-TO and CC, specify if non-nil @@ -1649,7 +1654,11 @@ The seventh argument ACTIONS is a list of actions to take ;;; (file-exists-p buffer-auto-save-file-name)) ;;; (message "Auto save file for draft message exists; consider M-x mail-recover")) ;;; t)) - (pop-to-buffer "*mail*") + + (if (eq noerase 'new) + (pop-to-buffer (generate-new-buffer "*mail*")) + (pop-to-buffer "*mail*")) + ;; Avoid danger that the auto-save file can't be written. (let ((dir (expand-file-name (file-name-as-directory mail-default-directory)))) @@ -1664,7 +1673,8 @@ The seventh argument ACTIONS is a list of actions to take ;; (in case the user has actually visited a file *mail*). ; (set-visited-file-name nil) (let (initialized) - (and (not noerase) + (and (or (not noerase) + (eq noerase 'new)) (if buffer-file-name (if (buffer-modified-p) (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") -- cgit v1.2.1 From 09c9e6bbb9cf894b406b40e8198e1360528ada71 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 12 Sep 2005 22:58:55 +0000 Subject: 2005-09-13 Chong Yidong * mail/sendmail.el (mail): Use new buffer if `noerase' is `new'. Fix behavior if noerase is `t' and there is no mail buffer. * simple.el (sendmail-user-agent-compose): Use a new mail buffer if `continue' is nil, rather than signal an error. --- lisp/mail/sendmail.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lisp/mail') diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 32328a33177..f7c62026d80 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1657,6 +1657,9 @@ The seventh argument ACTIONS is a list of actions to take (if (eq noerase 'new) (pop-to-buffer (generate-new-buffer "*mail*")) + (and noerase + (not (get-buffer "*mail*")) + (setq noerase nil)) (pop-to-buffer "*mail*")) ;; Avoid danger that the auto-save file can't be written. @@ -1673,8 +1676,8 @@ The seventh argument ACTIONS is a list of actions to take ;; (in case the user has actually visited a file *mail*). ; (set-visited-file-name nil) (let (initialized) - (and (or (not noerase) - (eq noerase 'new)) + (and (not (and noerase + (not (eq noerase 'new)))) (if buffer-file-name (if (buffer-modified-p) (when (y-or-n-p "Buffer has unsaved changes; reinitialize it and discard them? ") -- cgit v1.2.1 From 8381614263ceb53ebe900128ab0aefae0cf8e476 Mon Sep 17 00:00:00 2001 From: Deepak Goel Date: Sun, 18 Sep 2005 12:37:20 +0000 Subject: Message format spec fixes (commit 6) --- lisp/mail/feedmail.el | 2 +- lisp/mail/rmail-spam-filter.el | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lisp/mail') diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 7c7265ac8c9..d8740c036f2 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -1943,7 +1943,7 @@ mapped to mostly alphanumerics for safety." (file-exists-p a-s-file-name) (delete-file a-s-file-name)))) (if feedmail-queue-chatty - (progn (message (concat "FQM: Queued in " filename)) + (progn (message "%s" (concat "FQM: Queued in " filename)) (sit-for feedmail-queue-chatty-sit-for))) (if feedmail-queue-chatty (progn diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 7be5146f722..525bcd4096b 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -449,10 +449,10 @@ it from rmail file. Called for each new message retrieved by (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added subject \n <<< \n" message-subject + (message "%s" (concat "added subject \n <<< \n" message-subject " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added subject \n <<< \n" message-subject + (message "%s" (concat "added subject \n <<< \n" message-subject " \n >>> \n to list of spam definitions. \n" "Don't forget to save the spam definitions to file using the spam menu")) @@ -478,10 +478,10 @@ it from rmail file. Called for each new message retrieved by (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added sender \n <<< \n" message-sender + (message "%s" (concat "added sender \n <<< \n" message-sender " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added sender \n <<< \n " message-sender + (message "%s" (concat "added sender \n <<< \n " message-sender " \n >>> \n to list of spam definitions." "Don't forget to save the spam definitions to file using the spam menu")) @@ -521,10 +521,10 @@ Added to spam definitions as a contents field." (if rsf-autosave-newly-added-definitions (progn (custom-save-all) - (message (concat "added highlighted text \n <<< \n" region-to-spam-list + (message "%s" (concat "added highlighted text \n <<< \n" region-to-spam-list " \n >>> \n to list of spam definitions. \n" "and saved the spam definitions to file."))) - (message (concat "added highlighted text \n <<< \n " region-to-spam-list + (message "%s" (concat "added highlighted text \n <<< \n " region-to-spam-list " \n >>> \n to list of spam definitions." "Don't forget to save the spam definitions to file using the spam menu")) -- cgit v1.2.1