* gnus-int.el (gnus-internal-registry-spool-current-method): new variable

(gnus-request-scan): set
gnus-internal-registry-spool-current-method to gnus-command-method
before a request-scan operation

* gnus-registry.el (regtest-nnmail): use
gnus-internal-registry-spool-current-method

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae1ba31..fc3cd1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-07  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus-int.el (gnus-internal-registry-spool-current-method): new variable
+       (gnus-request-scan): set
+       gnus-internal-registry-spool-current-method to gnus-command-method
+       before a request-scan operation
+
+       * gnus-registry.el (regtest-nnmail): use
+       gnus-internal-registry-spool-current-method
+
+       
+
 2003-02-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * mail-source.el (mail-source-fetch): Typo fix.

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index 3282569..0b59072 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -51,6 +51,9 @@ server denied."
                 (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
 ;;;
@@ -487,9 +490,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."

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 4920a8f..79b4ad5 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -29,6 +29,7 @@
 (eval-when-compile (require 'cl))
 
 (require 'gnus)
+(require 'gnus-int)
 (require 'gnus-sum)
 (require 'nnmail)
 
@@ -47,11 +48,11 @@
 (defun regtest-nnmail (id group)
   (message "Registry: article %s spooled to %s"
           id
-          (gnus-group-guess-full-name group)))
+          (gnus-group-prefixed-name group gnus-internal-registry-spool-current-method t)))
 
-(add-hook 'gnus-summary-article-move-hook 'regtest) ; also does copy, respool, and crosspost
-(add-hook 'gnus-summary-article-delete-hook 'regtest)
-(add-hook 'gnus-summary-article-expire-hook 'regtest)
+;;(add-hook 'gnus-summary-article-move-hook 'regtest) ; also does copy, respool, and crosspost
+;;(add-hook 'gnus-summary-article-delete-hook 'regtest)
+;;(add-hook 'gnus-summary-article-expire-hook 'regtest)
 (add-hook 'nnmail-spool-hook 'regtest-nnmail)
 
 ;; TODO: