* wl.el (wl-check-environment): Merge examination for "@" at

inappropriate position into the first string-match.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index ef71323..201b8b8 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,8 @@
 2002-03-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
+       * wl.el (wl-check-environment): Merge examination for "@" at
+       inappropriate position into the first string-match.
+
        * wl-summary.el (wl-summary-target-mark-print): New function.
        (wl-summary-pipe-message-subr): Extracted from
        `wl-summary-pipe-message'.

diff --git a/wl/wl.el b/wl/wl.el
index 0faa5f4..ae347d7 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -707,10 +707,9 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
   ;; Message-ID
   (let ((message-id (funcall wl-message-id-function))
        domain)
-    (unless (string-match "^<\\(.*\\)@\\(.*\\)>$" message-id)
-      (error "Please check `wl-message-id-function'."))
-    (if (string-match "@" (match-string 1 message-id))
-       (error "Cannot get valid Message-ID string."))
+    (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"))