From: Kevin Greiner <kevin.greiner@compsol.cc>
Date: Mon, 3 Mar 2003 01:10:44 +0000 (+0000)
Subject: 	* gnus-int.el (gnus-retrieve-headers,
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=d1c275dfa4eeb0dd5c125356f056b6cd30f0e256;p=gnus

	* gnus-int.el (gnus-retrieve-headers,
	gnus-request-expire-articles): No longer checks gnus-agent-cache
	as it is handled internally by the agent.
	(gnus-request-head, gnus-request-body): Conditional checks
	surrounding gnus-agent-request-article removed; now performed by
	gnus-agent-request-article.
---

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 63b73c8b0..e89e9da02 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -347,7 +347,7 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
     (cond
      ((and gnus-use-cache (numberp (car articles)))
       (gnus-cache-retrieve-headers articles group fetch-old))
-     ((and gnus-agent gnus-agent-cache (gnus-online gnus-command-method)
+     ((and gnus-agent (gnus-online gnus-command-method)
 	   (gnus-agent-method-p gnus-command-method))
       (gnus-agent-retrieve-headers articles group fetch-old))
      (t
@@ -419,9 +419,7 @@ If BUFFER, insert the article in that group."
       (setq res (cons group article)
 	    clean-up t))
      ;; Check the agent cache.
-     ((and gnus-agent gnus-agent-cache gnus-plugged
-	   (numberp article)
-	   (gnus-agent-request-article article group))
+     ((gnus-agent-request-article article group)
       (setq res (cons group article)
 	    clean-up t))
      ;; Use `head' function.
@@ -454,9 +452,7 @@ If BUFFER, insert the article in that group."
       (setq res (cons group article)
 	    clean-up t))
      ;; Check the agent cache.
-     ((and gnus-agent gnus-agent-cache gnus-plugged
-	   (numberp article)
-	   (gnus-agent-request-article article group))
+     ((gnus-agent-request-article article group)
       (setq res (cons group article)
 	    clean-up t))
      ;; Use `head' function.
@@ -526,7 +522,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 	   (gnus-get-function gnus-command-method 'request-expire-articles)
 	   articles (gnus-group-real-name group) (nth 1 gnus-command-method)
 	   force)))
-    (when (and gnus-agent gnus-agent-cache
+    (when (and gnus-agent
 	       (gnus-agent-method-p gnus-command-method))
       (let ((expired-articles (gnus-sorted-difference articles not-deleted)))
         (when expired-articles
@@ -540,7 +536,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 					     'request-move-article)
 			  article (gnus-group-real-name group)
 			  (nth 1 gnus-command-method) accept-function last)))
-    (when (and result gnus-agent gnus-agent-cache
+    (when (and result gnus-agent
 	       (gnus-agent-method-p gnus-command-method))
       (gnus-agent-expire (list article) group 'force))
     result))