From: Jesper Harder Date: Tue, 20 May 2003 04:37:36 +0000 (+0000) Subject: (message-send-mail): Don't insert a courtesy copy X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=88f7ed72623988ff2c2761d1eed5592a4aa224b4;p=gnus (message-send-mail): Don't insert a courtesy copy notice in base64 encoded messages. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 295cfb0ea..02bb4c9ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-05-20 Jesper Harder + + * message.el (message-send-mail): Don't insert a courtesy copy + notice in base64 encoded messages. + 2003-05-16 Katsumi Yamaoka * gnus-sum.el (gnus-summary-move-article): Don't copy expirable diff --git a/lisp/message.el b/lisp/message.el index 1dc96a284..b1f66e775 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -3499,6 +3499,9 @@ It should typically alter the sending method in some way or other." (or (= (preceding-char) ?\n) (insert ?\n)) (message-cleanup-headers) + ;; FIXME: we're inserting the courtesy copy after encoding. + ;; This is wrong if the courtesy copy string contains + ;; non-ASCII characters. -- jh (when (save-restriction (message-narrow-to-headers) @@ -3506,13 +3509,19 @@ It should typically alter the sending method in some way or other." (or (message-fetch-field "cc") (message-fetch-field "bcc") (message-fetch-field "to")) - (let ((content-type (message-fetch-field "content-type"))) - (or - (not content-type) - (string= "text/plain" - (car - (mail-header-parse-content-type - content-type))))))) + (let ((content-type (message-fetch-field + "content-type"))) + (and + (or + (not content-type) + (string= "text/plain" + (car + (mail-header-parse-content-type + content-type)))) + (not + (string= "base64" + (message-fetch-field + "content-transfer-encoding"))))))) (message-insert-courtesy-copy)) (if (or (not message-send-mail-partially-limit) (< (point-max) message-send-mail-partially-limit)