X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-int.el;h=b9afda84049626c607ed61ff8a1dfa1d82b8860f;hb=9b0aa593cc4277d6b965dd42d669dc303be6d6b4;hp=129a6e3a7b29174b896783305fc64ca2069ad609;hpb=fb8e9c2df9b6b204e81f6189324b8ddae69b4518;p=elisp%2Fgnus.git- diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el index 129a6e3..b9afda8 100644 --- a/lisp/gnus-int.el +++ b/lisp/gnus-int.el @@ -1,5 +1,5 @@ ;;; gnus-int.el --- backend interface functions for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -30,6 +30,11 @@ (eval-when-compile (require 'cl)) (require 'gnus) +(require 'message) +(require 'gnus-range) + +(eval-when-compile + (defun gnus-agent-expire (&optional a b c))) (defcustom gnus-open-server-hook nil "Hook called just before opening connection to the news server." @@ -40,13 +45,16 @@ "The default status if the server is not able to open. If the server is covered by Gnus agent, the possible values are `denied', set the server denied; `offline', set the server offline; -`nil', ask user. If the server is not covered by Gnus agent, set the +nil, ask user. If the server is not covered by Gnus agent, set the server denied." :group 'gnus-start :type '(choice (const :tag "Ask" nil) (const :tag "Deny server" denied) (const :tag "Unplugg Agent" offline))) +(defvar gnus-internal-registry-spool-current-method nil + "The current method, for the registry.") + ;;; ;;; Server Communication ;;; @@ -220,12 +228,21 @@ If it is down, start it up (again)." (format "Unable to open %s:%s, go offline? " (car gnus-command-method) (cadr gnus-command-method))) - 'offline + 'offline 'denied)) 'denied))) ;; Return the result from the "open" call. - (or (eq (cadr elem) 'offline) - result))))) + (cond ((eq (cadr elem) 'offline) + ;; I'm avoiding infinite recursion by binding unopen + ;; status to denied (The logic of this routine + ;; guarantees that I can't get to this point with + ;; unopen status already bound to denied). + (unless (eq gnus-server-unopen-status 'denied) + (let ((gnus-server-unopen-status 'denied)) + (gnus-open-server gnus-command-method))) + t) + (t + result)))))) (defun gnus-close-server (gnus-command-method) "Close the connection to GNUS-COMMAND-METHOD." @@ -331,7 +348,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 @@ -403,9 +420,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. @@ -438,9 +453,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. @@ -474,9 +487,11 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned." (gnus-inhibit-demon t) (mail-source-plugged gnus-plugged)) (if (or gnus-plugged (not (gnus-agent-method-p gnus-command-method))) - (funcall (gnus-get-function gnus-command-method 'request-scan) - (and group (gnus-group-real-name group)) - (nth 1 gnus-command-method))))) + (progn + (setq gnus-internal-registry-spool-current-method gnus-command-method) + (funcall (gnus-get-function gnus-command-method 'request-scan) + (and group (gnus-group-real-name group)) + (nth 1 gnus-command-method)))))) (defsubst gnus-request-update-info (info gnus-command-method) "Request that GNUS-COMMAND-METHOD update INFO." @@ -508,18 +523,22 @@ 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 (gnus-agent-method-p gnus-command-method)) + (when (and gnus-agent + (gnus-agent-method-p gnus-command-method)) (let ((expired-articles (gnus-sorted-difference articles not-deleted))) (when expired-articles (gnus-agent-expire expired-articles group 'force)))) not-deleted)) -(defun gnus-request-move-article (article group server accept-function &optional last) +(defun gnus-request-move-article (article group server accept-function + &optional last) (let* ((gnus-command-method (gnus-find-method-for-group group)) - (result (funcall (gnus-get-function gnus-command-method 'request-move-article) + (result (funcall (gnus-get-function gnus-command-method + '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 (gnus-agent-method-p gnus-command-method)) + (when (and result gnus-agent + (gnus-agent-method-p gnus-command-method)) (gnus-agent-expire (list article) group 'force)) result))