[Emacs-diffs] Changes to emacs/lisp/gnus/nnmairix.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/02/27 09:19:15

Index: nnmairix.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnmairix.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- nnmairix.el 27 Feb 2008 09:11:02 -0000      1.3
+++ nnmairix.el 27 Feb 2008 09:19:15 -0000      1.4
@@ -434,7 +434,10 @@
         "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 @@
 
 ;;; ==== 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 @@
                (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