]> git.eshelyaron.com Git - emacs.git/commitdiff
Remove `smtpmail-address-buffer' temporary buffer
authorManuel Giraud <manuel@ledu-giraud.fr>
Mon, 15 Jul 2024 15:33:21 +0000 (17:33 +0200)
committerEshel Yaron <me@eshelyaron.com>
Wed, 12 Feb 2025 10:52:13 +0000 (11:52 +0100)
* lisp/mail/smtpmail.el (smtpmail-address-buffer): Remove variable.
(smtpmail-send-it):
(smtpmail-deduce-address-list): Replace `smtpmail-address-buffer' with a
temporary buffer.  Set `smtpmail-recipient-address-list' only in
caller.  (Bug#72128)

(cherry picked from commit e2991272f286af94f13d9d78ac609f08ad77183e)

lisp/mail/smtpmail.el

index 6cb576fe72bf5a704ac2f911d4b5f2b9c80a1e5b..43291a3028baf38bffd8b25c3258759a6234a23f 100644 (file)
@@ -182,7 +182,6 @@ These will then be used when sending the queue."
 
 ;;; Variables
 
-(defvar smtpmail-address-buffer)
 (defvar smtpmail-recipient-address-list nil)
 (defvar smtpmail--stored-queue-variables
   '(smtpmail-smtp-server
@@ -357,11 +356,9 @@ for `smtpmail-try-auth-method'.")
                  (erase-buffer))))
          ;; Encode the header according to RFC2047.
          (mail-encode-header (point-min) delimline)
-         ;;
-         (setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
+         ;; Get recipients' adresses
          (setq smtpmail-recipient-address-list
                 (smtpmail-deduce-address-list tembuf (point-min) delimline))
-         (kill-buffer smtpmail-address-buffer)
 
          (smtpmail-do-bcc delimline)
           ;; Send or queue
@@ -1064,8 +1061,7 @@ Returns an error if the server cannot be contacted."
 
 (defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end)
   "Get address list suitable for smtp RCPT TO: <address>."
-  (with-current-buffer smtpmail-address-buffer
-    (erase-buffer)
+  (with-temp-buffer
     (let ((case-fold-search t)
           (simple-address-list "")
           this-line
@@ -1108,7 +1104,7 @@ Returns an error if the server cannot be contacted."
          (backward-char 1)
          (setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1))
                                             recipient-address-list)))
-       (setq smtpmail-recipient-address-list recipient-address-list)))))
+        recipient-address-list))))
 
 (defun smtpmail-do-bcc (header-end)
   "Delete [Resent-]Bcc: and their continuation lines from the header area.