X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-logic.el;h=03b1c1c17581cac7dbd300545c8dd0c3dcd64f91;hb=e5bec5d05f433a43fa2d14cdb7bebeeefab8835f;hp=58dfb090fbcf77b77018b2276d4668f8c31d8a35;hpb=9dc12b9ca22173804a9fe992e95f0feb774bf828;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index 58dfb09..03b1c1c 100644
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -1,5 +1,6 @@
 ;;; gnus-logic.el --- advanced scoring code for Gnus
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -144,7 +145,7 @@
   (let* ((type (or type 's))
 	 (case-fold-search (not (eq (downcase (symbol-name type))
 				    (symbol-name type))))
-	 (header (aref gnus-advanced-headers index)))
+	 (header (or (aref gnus-advanced-headers index) "")))
     (cond
      ((memq type '(r R regexp Regexp))
       (string-match match header))
@@ -164,9 +165,9 @@
     (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))
@@ -218,7 +219,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)