Use the value of message-courtesy-message from the message buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c979f98..c878145 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * message.el (message-send-mail): Use the value of
+       message-courtesy-message from the message buffer.
+
        * gnus-html.el (gnus-html-browse-url): Implement mailto: URLs.
 
        * shr.el (shr-browse-url): Implement mailto: URLs.

diff --git a/lisp/message.el b/lisp/message.el
index 7160910..c0b7303 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4542,7 +4542,9 @@ This function could be useful in `message-setup-hook'."
                         (string= "base64"
                                  (message-fetch-field
                                   "content-transfer-encoding")))))))
-           (message-insert-courtesy-copy))
+           (message-insert-courtesy-copy
+            (with-current-buffer mailbuf
+              message-courtesy-message)))
           ;; Let's make sure we encoded all the body.
           (assert (save-excursion
                     (goto-char (point-min))
@@ -5983,7 +5985,7 @@ Headers already prepared in the buffer are not modified."
       ;; Check for IDNA
       (message-idna-to-ascii-rhs))))
 
-(defun message-insert-courtesy-copy ()
+(defun message-insert-courtesy-copy (message)
   "Insert a courtesy message in mail copies of combined messages."
   (let (newsgroups)
     (save-excursion
@@ -5993,12 +5995,12 @@ Headers already prepared in the buffer are not modified."
          (goto-char (point-max))
          (insert "Posted-To: " newsgroups "\n")))
       (forward-line 1)
-      (when message-courtesy-message
+      (when message
        (cond
-        ((string-match "%s" message-courtesy-message)
-         (insert (format message-courtesy-message newsgroups)))
+        ((string-match "%s" message)
+         (insert (format message newsgroups)))
         (t
-         (insert message-courtesy-message)))))))
+         (insert message)))))))
 
 ;;;
 ;;; Setting up a message buffer