From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 12 Aug 1993 00:23:54 +0000 (+0000)
Subject: (rmail-forward): Don't bind mail-signature, mail-setup-hook.
X-Git-Tag: emacs-19.34~11272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65c200c5715a07023486feb1a30ab25be1930052;p=emacs.git

(rmail-forward): Don't bind mail-signature, mail-setup-hook.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0b9d26573af..d55627ee0a6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1808,28 +1808,25 @@ see the documentation of `rmail-resend'."
 			       ""))
 			   (or (mail-fetch-field "Subject") "")
 			   "]")))
-      ;; 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 (and (not rmail-mail-new-frame) (one-window-p t))
-			 (function mail)
-		       (function rmail-start-mail))
-		     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)))
+      ;; 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 (and (not rmail-mail-new-frame) (one-window-p t))
+		       (function mail)
+		     (function rmail-start-mail))
+		   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)))))))
+	    (insert-buffer forward-buffer))))))
 
 (defun rmail-resend (address &optional from comment mail-alias-file)
   "Resend current message to ADDRESSES.