Importing Pterodactyl Gnus v0.89.

[elisp/gnus.git-] / lisp / gnus-logic.el

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index f2913f1..0b14ce0 100644 (file)
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -1,5 +1,5 @@
 ;;; gnus-logic.el --- advanced scoring code for Gnus
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -164,16 +164,16 @@
     (funcall type match (or (aref gnus-advanced-headers index) 0))))
 
 (defun gnus-advanced-date (index match type)
-  (let ((date (encode-time (parse-time-string
-                           (aref gnus-advanced-headers index))))
-       (match (encode-time (parse-time-string match))))
+  (let ((date (apply 'encode-time (parse-time-string
+                                  (aref gnus-advanced-headers index))))
+       (match (apply 'encode-time (parse-time-string match))))
     (cond
      ((eq type 'at)
       (equal date match))
      ((eq type 'before)
-      (gnus-time-less match date))
+      (time-less-p match date))
      ((eq type 'after)
-      (gnus-time-less date match))
+      (time-less-p date match))
      (t
       (error "No such date score type: %s" type)))))
 
@@ -218,7 +218,7 @@
                      ((memq type '(s S string String))
                       'search-forward)
                      (t
-                      (error "Illegal match type: %s" type)))))
+                      (error "Invalid match type: %s" type)))))
          (goto-char (point-min))
          (prog1
              (funcall search-func match nil t)