Sync with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4682643..d3d6551 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-24 23:49:23  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-send-mail): Narrow-to-headers.
+
 2000-08-24  Dave Love  <fx@gnu.org>
 
        * gnus-art.el (gnus-insert-mime-button): Fix help-echo for Emacs

diff --git a/lisp/message.el b/lisp/message.el
index 0c5b683..2a35e45 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2910,12 +2910,15 @@ This sub function is for exclusive use of `message-send-mail'."
            ;; require one newline at the end.
            (or (= (preceding-char) ?\n)
                (insert ?\n))
-           (when (and news
+           (when
+               (save-restriction
+                 (message-narrow-to-headers)
+                 (and news
                       (or (message-fetch-field "cc")
                           (message-fetch-field "to"))
                       (let ((ct (mime-read-Content-Type)))
                         (and (eq 'text (cdr (assq 'type ct)))
-                             (eq 'plain (cdr (assq 'subtype ct))))))
+                             (eq 'plain (cdr (assq 'subtype ct)))))))
              (message-insert-courtesy-copy))
            (setq failure (message-maybe-split-and-send-mail)))
        (kill-buffer tembuf))