From: yoichi <yoichi>
Date: Wed, 20 Mar 2002 12:20:04 +0000 (+0000)
Subject: Don't check message-id when wl-insert-message-id is nil.
X-Git-Tag: elmo-mark-root~242
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ee831e0665262b9206aaa9fcdf7a1a13241ac5c6;p=elisp%2Fwanderlust.git

Don't check message-id when wl-insert-message-id is nil.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 201b8b8..57c221e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-20  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl.el (wl-check-environment): Don't check Message-ID when
+	`wl-insert-message-id' is nil.
+
 2002-03-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl.el (wl-check-environment): Merge examination for "@" at
diff --git a/wl/wl.el b/wl/wl.el
index ae347d7..5bd036e 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -705,16 +705,17 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 (defun wl-check-environment (no-check-folder)
   (unless wl-from (elmo-warning "Please set `wl-from'."))
   ;; Message-ID
-  (let ((message-id (funcall wl-message-id-function))
-	domain)
-    (unless (string-match "^<\\([^@]*\\)@\\([^@]*\\)>$" message-id)
-      (error
-       "Check around `wl-message-id-function' to get valid Message-ID string."))
-    (setq domain (match-string 2 message-id))
-    (if (or (not (string-match "[^.]\\.[^.]" domain))
-	    (string= domain "localhost.localdomain"))
-	(elmo-warning
-	 "Please set `wl-message-id-domain' to get valid Message-ID string.")))
+  (when wl-insert-message-id
+    (let ((message-id (funcall wl-message-id-function))
+	  domain)
+      (unless (string-match "^<\\([^@]*\\)@\\([^@]*\\)>$" message-id)
+	(error
+	 "Check around `wl-message-id-function' to get valid Message-ID string."))
+      (setq domain (match-string 2 message-id))
+      (if (or (not (string-match "[^.]\\.[^.]" domain))
+	      (string= domain "localhost.localdomain"))
+	  (elmo-warning
+	   "Please set `wl-message-id-domain' to get valid Message-ID string."))))
   ;; folders
   (when (not no-check-folder)
     (let ((draft-folder (wl-folder-get-elmo-folder wl-draft-folder))