Mercurial > emacs

changeset 92260:261f98568bde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Glenn Morris <rgm@gnu.org>
date Wed, 27 Feb 2008 09:19:15 +0000
parents 5f51e1a51413
children c7f918f8347c
files lisp/gnus/nnmairix.el
diffstat 1 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/nnmairix.el	Wed Feb 27 09:11:02 2008 +0000
+++ b/lisp/gnus/nnmairix.el	Wed Feb 27 09:19:15 2008 +0000
@@ -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