From: hmurata <hmurata>
Date: Wed, 26 Dec 2001 12:14:12 +0000 (+0000)
Subject: * elmo-util.el (elmo-buffer-field-primitive-condition-match): Use
X-Git-Tag: wl-2_9_5~55
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7b50aa0bd7e4567b314a700494138b3a5c0753c4;p=elisp%2Fwanderlust.git

* elmo-util.el (elmo-buffer-field-primitive-condition-match): Use
`elmo-date-make-sortable-string' instead of
`timezone-make-date-sortable'.

* elmo-date.el (elmo-date-make-sortable-string): Use
`timezone-make-time-string'.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 19395ba..89b5550 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-26  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* elmo-util.el (elmo-buffer-field-primitive-condition-match): Use
+	`elmo-date-make-sortable-string' instead of
+	`timezone-make-date-sortable'.
+
+	* elmo-date.el (elmo-date-make-sortable-string): Use
+	`timezone-make-time-string'.
+
 2001-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo.el (elmo-folder-synchronize): Delete important messages too.
diff --git a/elmo/elmo-date.el b/elmo/elmo-date.el
index 47d10c9..7b6a925 100644
--- a/elmo/elmo-date.el
+++ b/elmo/elmo-date.el
@@ -201,7 +201,10 @@ Otherwise treat \\ in NEWTEXT string as special:
       (aref (, datevec) 0)
       (aref (, datevec) 1)
       (aref (, datevec) 2)
-      (aref (, datevec) 3))))
+      (timezone-make-time-string
+       (aref (, datevec) 3)
+       (aref (, datevec) 4)
+       (aref (, datevec) 5)))))
 
 (require 'product)
 (product-provide (provide 'elmo-date) (require 'elmo-version))
diff --git a/elmo/elmo-util.el b/elmo/elmo-util.el
index d84d544..ed51da6 100644
--- a/elmo/elmo-util.el
+++ b/elmo/elmo-util.el
@@ -816,37 +816,26 @@ Return value is a cons cell of (STRUCTURE . REST)"
 			 (length (memq number number-list)))
 		      (string-to-int (elmo-filter-value condition)))))
      ((string= (elmo-filter-key condition) "since")
-      (let* ((date (elmo-date-get-datevec (elmo-filter-value condition)))
-	     (field-date (elmo-date-make-sortable-string
-			  (timezone-fix-time
-			   (std11-field-body "date")
-			   (current-time-zone) nil)))
-	     (specified-date (timezone-make-sortable-date
-			      (aref date 0)
-			      (aref date 1)
-			      (aref date 2)
-			      (timezone-make-time-string
-			       (aref date 3)
-			       (aref date 4)
-			       (aref date 5)))))
+      (let ((field-date (elmo-date-make-sortable-string
+			 (timezone-fix-time
+			  (std11-field-body "date")
+			  (current-time-zone) nil)))
+	    (specified-date (elmo-date-make-sortable-string
+			     (elmo-date-get-datevec
+			      (elmo-filter-value condition)))))
 	(setq result
 	      (or (string= field-date specified-date)
 		  (string< specified-date field-date)))))
      ((string= (elmo-filter-key condition) "before")
-      (let ((date (elmo-date-get-datevec (elmo-filter-value condition))))
-	(setq result
-	      (string<
-	       (timezone-make-date-sortable
-		(timezone-fix-time
-		 (std11-field-body "date")
-		 (current-time-zone) nil))
-	       (timezone-make-sortable-date (aref date 0)
-					    (aref date 1)
-					    (aref date 2)
-					    (timezone-make-time-string
-					     (aref date 3)
-					     (aref date 4)
-					     (aref date 5)))))))
+      (setq result
+	    (string<
+	     (elmo-date-make-sortable-string
+	      (timezone-fix-time
+	       (std11-field-body "date")
+	       (current-time-zone) nil))
+	     (elmo-date-make-sortable-string
+	      (elmo-date-get-datevec
+	       (elmo-filter-value condition))))))
      ((string= (elmo-filter-key condition) "body")
       (and (re-search-forward "^$" nil t)	   ; goto body
 	   (setq result (search-forward (elmo-filter-value condition)