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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/03/01 01:28:14

Index: nnmairix.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/nnmairix.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- nnmairix.el 27 Feb 2008 09:19:15 -0000      1.4
+++ nnmairix.el 1 Mar 2008 01:28:14 -0000       1.5
@@ -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))))
+          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