[gnus git] branch master updated: n0-17-230-g2410ad4 =1= Adapt nnmairix to new gnus-registry API.

       via  2410ad47509c146d938d0272170aca73e050b09c (commit)
      from  c5768ba90962b843e4e8789f1dfa2e29fdb8d6e3 (commit)


- Log -----------------------------------------------------------------
commit 2410ad47509c146d938d0272170aca73e050b09c
Author: David Engster <[email protected]>
Date:   Thu Aug 18 19:31:36 2011 +0200

    Adapt nnmairix to new gnus-registry API.
    
    * nnmairix.el (nnmairix-request-set-mark)
    (nnmairix-goto-original-article): Remove adding of article to registry,
    since `gnus-registry-add-group' isn't available anymore.
    (nnmairix-determine-original-group-from-registry): Use
    `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
    available anymore.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f5f7bf..d026bd5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-18  David Engster  <[email protected]>
+
+	* nnmairix.el (nnmairix-request-set-mark)
+	(nnmairix-goto-original-article): Remove adding of article to registry,
+	since `gnus-registry-add-group' isn't available anymore.
+	(nnmairix-determine-original-group-from-registry): Use
+	`gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
+	available anymore.
+
 2011-08-17  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make
diff --git a/lisp/nnmairix.el b/lisp/nnmairix.el
index b82d6c2..3d1ac02 100644
--- a/lisp/nnmairix.el
+++ b/lisp/nnmairix.el
@@ -604,9 +604,7 @@ Other back ends might or might not work.")
 
 ;; Silence byte-compiler.
 (defvar gnus-registry-install)
-(autoload 'gnus-registry-fetch-group "gnus-registry")
-(autoload 'gnus-registry-fetch-groups "gnus-registry")
-(autoload 'gnus-registry-add-group "gnus-registry")
+(autoload 'gnus-registry-get-id-key "gnus-registry")
 
 (deffoo nnmairix-request-set-mark (group actions &optional server)
   (when server
@@ -660,13 +658,7 @@ Other back ends might or might not work.")
 			      nnmairix-only-use-registry)
 		    (setq ogroup
 			  (nnmairix-determine-original-group-from-path
-			   mid nnmairix-current-server))
-		    ;; if available and allowed, add this entry to the registry
-		    (when (and (boundp 'gnus-registry-install)
-			       gnus-registry-install)
-		      (dolist (cur ogroup)
-			(unless (gnus-parameter-registry-ignore cur)
-			  (gnus-registry-add-group mid cur)))))
+			   mid nnmairix-current-server)))
 		  (unless ogroup
 		    (nnheader-message
 		     3 "Unable to set mark: couldn't find original group for %s" mid)
@@ -1630,14 +1622,7 @@ search in raw mode."
 	;; registry was not available or did not find article
 	;; so we search again with mairix in raw mode to get filename
 	(setq allgroups
-	      (nnmairix-determine-original-group-from-path mid server))
-	;; if available and allowed, add this entry to the registry
-	(when (and (not no-registry)
-		   (boundp 'gnus-registry-install)
-		   gnus-registry-install)
-	  (dolist (cur allgroups)
-	    (unless (gnus-parameter-registry-ignore cur)
-	      (gnus-registry-add-group mid cur)))))
+	      (nnmairix-determine-original-group-from-path mid server)))
       (if (> (length allgroups) 1)
 	  (setq group
 		(gnus-completing-read
@@ -1657,7 +1642,7 @@ search in raw mode."
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)
       (set mid (concat mid ">")))
-    (gnus-registry-fetch-groups mid)))
+    (gnus-registry-get-id-key mid 'group)))
 
 (defun nnmairix-determine-original-group-from-path (mid server)
   "Determine original group(s) for message-id MID from the file path.

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    9 +++++++++
 lisp/nnmairix.el |   23 ++++-------------------
 2 files changed, 13 insertions(+), 19 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project