Changes committed gnus/lisp (ChangeLog nnmairix.el)

Modified: ChangeLog nnmairix.el

(nnmairix-group-regexp, nnmairix-valid-backends, nnmairix-last-server)
(nnmairix-current-server): Defvar them.
(nnmairix-goto-original-article): Defvar gnus-registry-install and autoload
 gnus-registry-fetch-group when compiling.
(nnmairix-request-group-with-article-number-correction): remove unreferenced
 argument passed to nnmairix-call-backend;
 express real group name in the response.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1761 gnus/lisp/ChangeLog:7.1762
--- ChangeLog:7.1761	Wed Feb 27 23:22:47 2008
+++ ChangeLog	Thu Feb 28 00:44:30 2008
@@ -1,3 +1,17 @@
+2008-02-27  David Engster  <[email protected]>
+
+	* nnmairix.el (nnmairix-request-group-with-article-number-correction):
+	Express real group name in the response.
+
+2008-02-27  Katsumi Yamaoka  <[email protected]>
+
+	* nnmairix.el (nnmairix-group-regexp, nnmairix-valid-backends)
+	(nnmairix-last-server, nnmairix-current-server): Defvar them.
+	(nnmairix-goto-original-article): Defvar gnus-registry-install and
+	autoload gnus-registry-fetch-group when compiling.
+	(nnmairix-request-group-with-article-number-correction): remove
+	unreferenced argument passed to nnmairix-call-backend.
+
 2008-02-27  Reiner Steib  <[email protected]>
 
 	* mm-uu.el (mm-uu-type-alist): Fix message-marks non-hide arguments.
Index: nnmairix.el
diff -u gnus/lisp/nnmairix.el:7.2 gnus/lisp/nnmairix.el:7.3
--- nnmairix.el:7.2	Wed Feb 27 07:06:43 2008
+++ nnmairix.el	Thu Feb 28 00:44:30 2008
@@ -336,18 +336,19 @@
 
 ;;; === Internal variables
 
-;; Regexp for mairix groups on back end
-(setq nnmairix-group-regexp (format "%s-\\(.*\\)-[0-9]+" nnmairix-group-prefix))
+(defvar nnmairix-group-regexp
+  (format "%s-\\(.*\\)-[0-9]+" nnmairix-group-prefix)
+  "Regexp for mairix groups on back end.")
+
+(defvar nnmairix-valid-backends '(nnimap nnml nnmaildir)
+  "Back ends (hopefully...) supported by nnmairix.
+Other backends might or might not work.")
 
-;; Back ends (hopefully...) supported by nnmairix.
-;; Other backends might or might not work.
-(setq nnmairix-valid-backends '(nnimap nnml nnmaildir))
+(defvar nnmairix-last-server nil
+  "Last chosen server.")
 
-;; Last chosen server
-(setq nnmairix-last-server nil)
-
-;; Current server
-(setq nnmairix-current-server nil)
+(defvar nnmairix-current-server nil
+  "Current server.")
 
 ;;; === Gnus backend functions
   
@@ -843,6 +844,11 @@
 	  (set-process-sentinel (apply 'start-process args)
 				'nnmairix-sentinel-mairix-update-finished))))))
 
+;; 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.
 The original group of the article is first determined with the
@@ -974,7 +980,7 @@
   "Request FOLDER on backend for nnmairix QUALGROUP and article number correction."
   (save-excursion
     (nnmairix-call-backend
-     "request-group" folder nnmairix-backend-server fast)
+     "request-group" folder nnmairix-backend-server)
     (set-buffer nnmairix-mairix-output-buffer)
     (goto-char (point-min))
     (re-search-forward "^Matched.*messages")
@@ -1006,7 +1012,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
+			    (gnus-group-real-name qualgroup)))
 	    t)
 	(progn
 	  (nnheader-report