diff lisp/gnus/nnmairix.el @ 92359:1af6d6eab2e9

Merge from gnus--devo--0 Revision: [e-mail]/emacs--devo--0--patch-1089

--- a/lisp/gnus/nnmairix.el	Sat Mar 01 00:26:22 2008 +0000
+++ b/lisp/gnus/nnmairix.el	Sat Mar 01 01:28:14 2008 +0000
@@ -434,10 +434,8 @@
 	 "request-scan" folder nnmairix-backend-server)
 	(if fast
 	    t
-          (let ((nnmairix-fast fast)
-                (nnmairix-group group))
-            (nnmairix-request-group-with-article-number-correction
-             folder qualgroup))))
+	  (nnmairix-request-group-with-article-number-correction
+	   folder qualgroup)))
        ((and (= rval 1)
 	     (save-excursion (set-buffer nnmairix-mairix-output-buffer)
 			     (goto-char (point-min))
@@ -849,7 +847,10 @@
 	  (set-process-sentinel (apply 'start-process args)
 				'nnmairix-sentinel-mairix-update-finished))))))
 
-(autoload 'gnus-registry-fetch-group "gnus-registry")
+;; Silence byte-compiler.
+(eval-when-compile
+  (defvar gnus-registry-install)
+  (autoload 'gnus-registry-fetch-group "gnus-registry"))
 
 (defun nnmairix-goto-original-article (&optional no-registry)
   "Jump to the original group and display article.
@@ -978,17 +979,10 @@
 
 ;;; ==== Helper functions
 
-;; Set locally in nnmairix-request-group, which is the only caller of
-;; this function.
-(defvar nnmairix-fast)
-(defvar nnmairix-group)
-
 (defun nnmairix-request-group-with-article-number-correction (folder qualgroup)
   "Request FOLDER on backend for nnmairix QUALGROUP and article number correction."
   (save-excursion
-    ;; FIXME nnmairix-request-group only calls this when fast is nil (?).
-    (nnmairix-call-backend
-     "request-group" folder nnmairix-backend-server nnmairix-fast)
+    (nnmairix-call-backend "request-group" folder nnmairix-backend-server)
     (set-buffer nnmairix-mairix-output-buffer)
     (goto-char (point-min))
     (re-search-forward "^Matched.*messages")
@@ -1021,7 +1015,7 @@
 		 qualgroup 'numcorr (list nil 0 high))))
 	    (erase-buffer)
 	    (insert (format "%d %d %d %d %s" status total low high
-                            nnmairix-group))
+			    (gnus-group-real-name qualgroup)))
 	    t)
 	(progn
 	  (nnheader-report