summaryrefslogtreecommitdiff
path: root/lisp/mail
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1992-09-14 19:00:13 +0000
committerRichard M. Stallman <rms@gnu.org>1992-09-14 19:00:13 +0000
commit2ae662cca1e9e4ed4245eacbfff7ac74d816f535 (patch)
tree1cea9ac02ec3dfdc91b8d127e093d7e0c1b8a0e0 /lisp/mail
parentb5f716ab188c4450dfdaf919a0338ee160bd221d (diff)
downloademacs-2ae662cca1e9e4ed4245eacbfff7ac74d816f535.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/rmail.el39
1 files changed, 21 insertions, 18 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 17ae38a227d..47fc2f3abfa 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1507,24 +1507,27 @@ use \\[mail-yank-original] to yank the original message into it."
(subject (concat "["
(mail-strip-quoted-names (mail-fetch-field "From"))
": " (or (mail-fetch-field "Subject") "") "]")))
- ;; If only one window, use it for the mail buffer.
- ;; 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)
- (function mail)
- (function mail-other-window))
- nil nil subject nil nil nil
- (list (list (function (lambda (buf msgnum)
- (save-excursion
- (set-buffer buf)
- (rmail-set-attribute "forwarded" t msgnum))))
- (current-buffer)
- rmail-current-message)))
- (save-excursion
- (goto-char (point-max))
- (forward-line 1)
- (insert-buffer forward-buffer)))))
+ ;; Turn off the usual actions for initializing the message body
+ ;; because we want to get only the text from the failure message.
+ (let (mail-signature mail-setup-hook)
+ ;; If only one window, use it for the mail buffer.
+ ;; 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)
+ (function mail)
+ (function mail-other-window))
+ nil nil subject nil nil nil
+ (list (list (function (lambda (buf msgnum)
+ (save-excursion
+ (set-buffer buf)
+ (rmail-set-attribute "forwarded" t msgnum))))
+ (current-buffer)
+ rmail-current-message)))
+ (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.