From: hmurata <hmurata>
Date: Wed, 18 Aug 2004 14:45:01 +0000 (+0000)
Subject: (elmo-condition-parse-search-value): Fixed atom
X-Git-Tag: wl-2_11_31~41
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b4947d56b3b20aa7e40cb264839ff2b3f4d77327;p=elisp%2Fwanderlust.git

(elmo-condition-parse-search-value): Fixed atom
parsing.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index df9f61b..f138a8c 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-18  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-util.el (elmo-condition-parse-search-value): Fixed atom
+	parsing.
+
 2004-08-09  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-pop3.el (elmo-pop3-read-response): Refined the regexp for
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index ce885a7..ecaa2b7 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -278,13 +278,13 @@ Return value is a cons cell of (STRUCTURE . REST)"
   (cond
    ((looking-at "\"")
     (read (current-buffer)))
-   ((or (looking-at "yesterday") (looking-at "lastweek")
+   ((or (looking-at elmo-condition-atom-regexp)
+	(looking-at "yesterday") (looking-at "lastweek")
 	(looking-at "lastmonth") (looking-at "lastyear")
 	(looking-at "[0-9]+ *daysago")
 	(looking-at "[0-9]+-[A-Za-z]+-[0-9]+")
 	(looking-at "[0-9]+-[0-9]+-[0-9]+")
-	(looking-at "[0-9]+")
-	(looking-at elmo-condition-atom-regexp))
+	(looking-at "[0-9]+"))
     (prog1 (elmo-match-buffer 0)
       (goto-char (match-end 0))))
    (t (error "Syntax error '%s'" (buffer-string)))))