(nnmairix-request-group): Bind nnmairix-fast and nnmairix-group around

nnmairix-request-group-with-article-number-correction call.
(nnmairix-fast, nnmairix-group): New, less general names, for free
variables passed from nnmairix-request-group to
nnmairix-request-group-with-article-number-correction.  Declare.
(nnmairix-request-group-with-article-number-correction):
Use nnmairix-fast, nnmairix-group rather than fast, group.

2 files changed, 28 insertions, 3 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 798064a35d7..d7f16a7c610 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,6 +1,21 @@
 2008-02-27  Glenn Morris  <rgm@gnu.org>
 
 	* nnmairix.el: Change defcustom :version from 23.0 to 23.1.
+	(nnmairix-group-regexp, nnmairix-valid-backends): Convert from free
+	variables to defconsts.  Convert comments to doc-strings.
+	(nnmairix-last-server, nnmairix-current-server): Convert from free
+	variables to defvars.  Convert comments to doc-strings.
+	(gnus-registry-fetch-group): Autoload.
+	(nnmairix-replace-group-and-numbers): Use mapc rather than mapcar.
+	(nnmairix-widget-get-values, nnmairix-widget-make-query-from-widgets)
+	(nnmairix-widget-build-editable-fields): Use car cddr rather than caddr.
+	(nnmairix-request-group): Bind nnmairix-fast and nnmairix-group around
+	nnmairix-request-group-with-article-number-correction call.
+	(nnmairix-fast, nnmairix-group): New, less general names, for free
+	variables passed from nnmairix-request-group to
+	nnmairix-request-group-with-article-number-correction.  Declare.
+	(nnmairix-request-group-with-article-number-correction):
+	Use nnmairix-fast, nnmairix-group rather than fast, group.
 
 2008-02-26  David Engster  <dengste@eml.cc>
 
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index aa635b2d99c..27f8fa035d7 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -434,7 +434,10 @@ Other backends might or might not work.")
 	 "request-scan" folder nnmairix-backend-server)
 	(if fast
 	    t
-	  (nnmairix-request-group-with-article-number-correction folder qualgroup)))
+          (let ((nnmairix-fast fast)
+                (nnmairix-group group))
+            (nnmairix-request-group-with-article-number-correction
+             folder qualgroup))))
        ((and (= rval 1)
 	     (save-excursion (set-buffer nnmairix-mairix-output-buffer)
 			     (goto-char (point-min))
@@ -975,11 +978,17 @@ search in raw mode."
 
 ;;; ==== 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 fast)
+     "request-group" folder nnmairix-backend-server nnmairix-fast)
     (set-buffer nnmairix-mairix-output-buffer)
     (goto-char (point-min))
     (re-search-forward "^Matched.*messages")
@@ -1011,7 +1020,8 @@ search in raw mode."
 		(gnus-group-set-parameter
 		 qualgroup 'numcorr (list nil 0 high))))
 	    (erase-buffer)
-	    (insert (format "%d %d %d %d %s" status total low high group))
+	    (insert (format "%d %d %d %d %s" status total low high
+                            nnmairix-group))
 	    t)
 	(progn
 	  (nnheader-report