Synch to No Gnus 200409220316.

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

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 922d575..c5bf584 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -48,11 +48,19 @@ 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
 server denied."
+  :version "21.4"
   :group 'gnus-start
   :type '(choice (const :tag "Ask" nil)
                 (const :tag "Deny server" denied)
                 (const :tag "Unplug Agent" offline)))
 
+(defcustom gnus-servers-that-use-local-marks '(nntp)
+  "A list of backends that store marks locally.  This means that
+  the backend is used to set its marks even when unplugged."
+  :version "21.4"
+  :group 'gnus-start
+  :type '(repeat symbol))
+
 (defvar gnus-internal-registry-spool-current-method nil
   "The current method, for the registry.")
 
@@ -413,7 +421,10 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
 
 (defun gnus-request-set-mark (group action)
   "Set marks on articles in the back end."
-  (let ((gnus-command-method (gnus-find-method-for-group group)))
+  (let* ((gnus-command-method (gnus-find-method-for-group group))
+        (gnus-plugged (or gnus-plugged 
+                          (member (car gnus-command-method)
+                                  gnus-servers-that-use-local-marks))))
     (if (not (gnus-check-backend-function
              'request-set-mark (car gnus-command-method)))
        action
@@ -423,7 +434,10 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
 
 (defun gnus-request-update-mark (group article mark)
   "Allow the back end to change the mark the user tries to put on an article."
-  (let ((gnus-command-method (gnus-find-method-for-group group)))
+  (let* ((gnus-command-method (gnus-find-method-for-group group))
+        (gnus-plugged (or gnus-plugged 
+                          (member (car gnus-command-method)
+                                  gnus-servers-that-use-local-marks))))
     (if (not (gnus-check-backend-function
              'request-update-mark (car gnus-command-method)))
        mark
@@ -570,7 +584,7 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
                          (nth 1 gnus-command-method) accept-function last)))
     (when (and result gnus-agent
               (gnus-agent-method-p gnus-command-method))
-      (gnus-agent-expire (list article) group 'force))
+      (gnus-agent-unfetch-articles group (list article)))
     result))
 
 (defun gnus-request-accept-article (group &optional gnus-command-method last