X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-logic.el;h=af33a36ecfdb82d43758708a6b10ea1e6fbb1468;hb=d0498ec691ac9cc3f6bdd9f4ba3ac26457cc3d8a;hp=4756b148fb005c3ec00be789d62d9a803ec25a0e;hpb=8f22dc3866405e2211e7d6201491100371c3cd9a;p=gnus

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index 4756b148f..af33a36ec 100644
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -27,14 +27,13 @@
 
 (require 'gnus-load)
 (require 'gnus-score)
-;(require 'parse-time)
 (require 'gnus-util)
 
 ;;; Internal variables. 
 
 (defvar gnus-advanced-headers nil)
 
-;; To avoid having 8-bit charaters in the source file.
+;; To avoid having 8-bit characters in the source file.
 (defvar gnus-advanced-not (intern (format "%c" 172)))
 
 (defconst gnus-advanced-index
@@ -51,6 +50,9 @@
     ("head" nil gnus-advanced-body)
     ("body" nil gnus-advanced-body)
     ("all" nil gnus-advanced-body)))
+
+(eval-and-compile
+  (autoload 'parse-time-string "parse-time"))
      
 (defun gnus-score-advanced (rule &optional trace)
   "Apply advanced scoring RULE to all the articles in the current group."
@@ -67,8 +69,8 @@
 		       (or (nth 1 rule)
 			   gnus-score-interactive-default-score)))
 	  (push (cons (mail-header-number gnus-advanced-headers)
-		       (or (nth 1 rule)
-			   gnus-score-interactive-default-score))
+		      (or (nth 1 rule)
+			  gnus-score-interactive-default-score))
 		gnus-newsgroup-scored)
 	  (when trace
 	    (push (cons "A file" rule)
@@ -84,7 +86,8 @@
       (if (not rule)
 	  t				; Empty rule is true.
 	(while (and rule
-		    (gnus-advanced-score-rule (pop rule))))
+		    (gnus-advanced-score-rule (car rule)))
+	  (pop rule))
 	;; If all the rules were true, then `rule' should be nil.
 	(not rule)))
      ;; "Or" rule.