Revive checking if `wl-message-id-domain' contains "@".

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 57c221e..7cb0994 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -2,6 +2,7 @@
 
        * wl.el (wl-check-environment): Don't check Message-ID when
        `wl-insert-message-id' is nil.
+       Revive checking if `wl-message-id-domain' contains "@".
 
 2002-03-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 

diff --git a/wl/wl.el b/wl/wl.el
index 5bd036e..933ae53 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -709,8 +709,12 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
     (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."))
+       (cond
+        ((string-match "@" wl-message-id-domain)
+         (error "Please remove `@' from `wl-message-id-domain'."))
+        (t
+         (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"))