(mail-reply-buffer, mail-send-actions):

Mark them as permanent-local.
(mail-mode): Don't set mail-reply-buffer to nil.

1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index da3707f2179..516aad5128f 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -164,6 +164,8 @@ If t, it means to insert the contents of the file `mail-signature-file'.")
 (defvar mail-reply-buffer nil)
 (defvar mail-send-actions nil
   "A list of actions to be performed upon successful sending of a message.")
+(put 'mail-reply-buffer 'permanent-local t)
+(put 'mail-send-actions 'permanent-local t)
 
 (defvar mail-default-headers nil
   "*A string containing header lines, to be inserted in outgoing messages.
@@ -315,7 +317,6 @@ C-c C-v  mail-sent-via (add a Sent-via field for each To or CC)."
   (interactive)
   (kill-all-local-variables)
   (make-local-variable 'mail-reply-buffer)
-  (setq mail-reply-buffer nil)
   (make-local-variable 'mail-send-actions)
   (set-syntax-table mail-mode-syntax-table)
   (use-local-map mail-mode-map)