From 417bdb5a919cd9f3bb180a4ec4f30473c7c42709 Mon Sep 17 00:00:00 2001 From: yoichi Date: Wed, 20 Mar 2002 12:35:44 +0000 Subject: [PATCH] Revive checking if `wl-message-id-domain' contains "@". --- wl/ChangeLog | 1 + wl/wl.el | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 57c221e..7cb0994 100644 --- 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 diff --git a/wl/wl.el b/wl/wl.el index 5bd036e..933ae53 100644 --- 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")) -- 1.7.10.4