summaryrefslogtreecommitdiff
path: root/lisp/gnus/nnmairix.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2008-03-01 01:28:14 +0000
committerMiles Bader <miles@gnu.org>2008-03-01 01:28:14 +0000
commit14e8de0c3f87a228c05902be66c5bcf953636611 (patch)
treef5dedbed1ff15d1badc46a54951fae5e4bdafadc /lisp/gnus/nnmairix.el
parent5831b5a64833baa4a1baa7b3c5d17e72b74d8e4c (diff)
downloademacs-14e8de0c3f87a228c05902be66c5bcf953636611.tar.gz
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1089
Diffstat (limited to 'lisp/gnus/nnmairix.el')
-rw-r--r--lisp/gnus/nnmairix.el22
1 files changed, 8 insertions, 14 deletions
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 27f8fa035d7..57b840ff692 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -434,10 +434,8 @@ Other backends might or might not work.")
"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 @@ with `nnmairix-mairix-update-options'."
(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 @@ 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 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 @@ search in raw mode."
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