*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2410c33..a86f124 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2000-08-14 20:08:40  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-send-mail): Only insert courtesy message
+       when text/plain.
+
+2000-08-14 19:55:04  Jesper Harder  <jesper_harder@hotmail.com>
+
+       * message.el (message-cancel-news): Copy the From header from the
+       original article.
+
+2000-08-14 19:52:01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-async.el (gnus-asynchronous): Removed.
+
 2000-08-14 16:12:11  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mail-source.el (mail-source-fetch-maildir): Use MMDF mail

diff --git a/lisp/message.el b/lisp/message.el
index c9ed7ff..4c60687 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2296,7 +2296,11 @@ It should typically alter the sending method in some way or other."
              (insert ?\n))
          (when (and news
                     (or (message-fetch-field "cc")
-                        (message-fetch-field "to")))
+                        (message-fetch-field "to"))
+                    (string= "text/plain"
+                             (car
+                              (mail-header-parse-content-type
+                               (message-fetch-field "content-type")))))
            (message-insert-courtesy-copy))
          (if (or (not message-send-mail-partially-limit)
                  (< (point-max) message-send-mail-partially-limit)
@@ -3913,7 +3917,7 @@ If ARG, allow editing of the cancellation message."
          (setq buf (set-buffer (get-buffer-create " *message cancel*"))))
        (erase-buffer)
        (insert "Newsgroups: " newsgroups "\n"
-               "From: " (message-make-from) "\n"
+               "From: " from "\n"
                "Subject: cmsg cancel " message-id "\n"
                "Control: cancel " message-id "\n"
                (if distribution