From: yamaoka <yamaoka>
Date: Tue, 15 Aug 2000 22:32:14 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~147
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=495c3cc8312421f7efd3dee3bf9b197b36b01ac1;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2410c33..a86f124 100644
--- 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 bdcebae..975ae72 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2912,7 +2912,10 @@ This sub function is for exclusive use of `message-send-mail'."
 		(insert ?\n))
 	    (when (and news
 		       (or (message-fetch-field "cc")
-			   (message-fetch-field "to")))
+			   (message-fetch-field "to"))
+		       (let ((ct (mime-read-Content-Type)))
+			 (and (eq 'text (cdr (assq 'type ct)))
+			      (eq 'plain (cdr (assq 'subtype ct))))))
 	      (message-insert-courtesy-copy))
 	    (setq failure (message-maybe-split-and-send-mail)))
 	(kill-buffer tembuf))
@@ -4801,7 +4804,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
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5359953..e2f334b 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11153,6 +11153,17 @@ www.my-deja.com などのウェブメールサーバーからメールを取得します。
 トで、最初の要素が @code{:} であると、2番目の要素が @var{args} を引数と
 して関数として呼ばれます。関数は @var{split} を返すべきです。
 
+例えば以下の関数は、記事のボディに基づいた分割に使えるでしょう:
+
+@lisp
+(defun split-on-body ()
+  (save-excursion
+    (set-buffer " *nnmail incoming*")
+    (goto-char (point-min))
+    (when (re-search-forward "Some.*string" nil t)
+      "string.group")))
+@end lisp
+
 @item
 @code{(! @var{func} @var{split})}: 分割がリストで、最初の要素が @code{!}
  であると @var{split} が実行され、@var{func} は @var{split} の結果を引数
diff --git a/texi/gnus.texi b/texi/gnus.texi
index c304279..ada0a4e 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11587,6 +11587,18 @@ a list, and the first element is @code{:}, then the second element will
 be called as a function with @var{args} given as arguments.  The
 function should return a @var{split}.
 
+For instance, the following function could be used to split based on the
+body of the messages:
+
+@lisp
+(defun split-on-body ()
+  (save-excursion
+    (set-buffer " *nnmail incoming*")
+    (goto-char (point-min))
+    (when (re-search-forward "Some.*string" nil t)
+      "string.group")))
+@end lisp
+
 @item
 @code{(! @var{func} @var{split})}: If the split is a list, and the first
 element is @code{!}, then SPLIT will be processed, and FUNC will be