From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Sun, 21 Apr 2024 00:25:20 +0000 (-0700)
Subject: Re-encode message bodies with externalized attachments during FCC
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07d8418a446cd8e98849bffba44091ddefdf0b0a;p=emacs.git

Re-encode message bodies with externalized attachments during FCC

Bug#70338

* lisp/gnus/message.el (message-do-fcc): If the user has requested to
externalize attachments, we can't use the cached version of the message
body from sending. This mirrors an equivalent check for GCC in
`gnus-inews-do-gcc'.

(cherry picked from commit 3dfca6f9c7f4da512fff48cf6957c6492e2c0449)
---

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 979d2fecf56..b2805774162 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5768,8 +5768,10 @@ The result is a fixnum."
       (with-temp-buffer
 	(insert-buffer-substring buf)
 	(message-clone-locals buf)
-	;; Avoid re-doing things like GPG-encoding secret parts.
-	(if (not encoded-cache)
+	;; Avoid re-doing things like GPG-encoding secret parts, unless
+	;; the user has requested that attachments be externalized, in
+	;; which case we have to re-encode the message body.
+	(if (or mml-externalize-attachments (not encoded-cache))
 	    (message-encode-message-body)
 	  (erase-buffer)
 	  (insert encoded-cache))