From 8af3cd3e1219eee8d13bfc4333ade60754aa3ee3 Mon Sep 17 00:00:00 2001
From: ichikawa <ichikawa>
Date: Mon, 28 Sep 1998 14:27:33 +0000
Subject: [PATCH] Fix typo in nnmh.el and Insert different Message-ID in each
 message/partail message

---
 ChangeLog       |    4 ++++
 lisp/message.el |   17 +++++++++++++++--
 lisp/nnmh.el    |    4 ++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c7cd7f..c0450a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* lisp/nnmh.el (nnmh-request-accept-article): Insert `Message-ID'
 	only if `group' name is neither "queue" nor "draft".
+	Fix typo (at 23:25).
+
+	*lisp/message.el (message-send-mail): Add different Message-ID in 
+	each message/partial
 
 1998-09-26  Katsumi Yamaoka   <yamaoka@jpl.org>
 
diff --git a/lisp/message.el b/lisp/message.el
index f414d1f..2e56439 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2230,12 +2230,25 @@ the user from the mailer."
 		     (or (message-fetch-field "cc")
 			 (message-fetch-field "to")))
 	    (message-insert-courtesy-copy))
+;;	  (mime-edit-maybe-split-and-send
+;;	   (function
+;;	    (lambda ()
+;;	      (interactive)
+;;	      (funcall message-send-mail-function)
+;;	      )))
 	  (mime-edit-maybe-split-and-send
 	   (function
 	    (lambda ()
 	      (interactive)
-	      (funcall message-send-mail-function)
-	      )))
+	      (save-restriction
+		(std11-narrow-to-header mail-header-separator)
+		(goto-char (point-min))
+		(when (re-search-forward "^Message-Id:" nil t)
+		  (delete-region (match-end 0)(std11-field-end))
+		  (insert (concat " " (message-make-message-id)))
+		  ))
+	      (interactive)
+	      (funcall message-send-mail-function))))
 	  (funcall message-send-mail-function))
       (kill-buffer tembuf))
     (set-buffer message-edit-buffer)
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 2c4dd68..6f4480d 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -294,8 +294,8 @@
 
 (deffoo nnmh-request-accept-article (group &optional server last noinsert)
   (nnmh-possibly-change-directory group server)
-  (if (or (not (equal group "queue"))
-	  (not (equal group "draft")))
+  (if (and (not (equal group "queue"))
+	   (not (equal grouo "draft")))
       (nnmail-check-syntax))
   (when nnmail-cache-accepted-message-ids
     (nnmail-cache-insert (nnmail-fetch-field "message-id")))
-- 
1.7.10.4