* wl.el (wl-check-environment): Check too many `@'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 091bc13..c70fde1 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-08  Kenichi OKADA      <okada@opaopa.org>
+
+       * wl.el (wl-check-environment): Check too many `@'.
+
 2000-10-08   Mikio Nakajima <minakaji@osaka.email.ne.jp>
 
        * wl-thread.el (wl-thread-delete-message): Fix parentheses.

diff --git a/wl/wl.el b/wl/wl.el
index b5939ac..3ea1a6d 100644 (file)
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -699,6 +699,12 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
                                                      "." wl-local-domain)
                                            (system-name))))
     (error "Please set `wl-local-domain' to get valid FQDN"))
+  (if (string-match "@" (or wl-message-id-domain
+                           (if wl-local-domain
+                               (concat (system-name)
+                                       "." wl-local-domain)
+                             (system-name))))
+      (error "Please remove `@' from `wl-message-id-domain'"))
   (when (not no-check-folder)
     (if (not (eq (elmo-folder-get-type wl-draft-folder) 'localdir))
        (error "%s is not allowed for draft folder" wl-draft-folder))