[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:11:02

Index: nnmairix.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/gnus/nnmairix.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- nnmairix.el 27 Feb 2008 08:57:36 -0000      1.2
+++ nnmairix.el 27 Feb 2008 09:11:02 -0000      1.3
@@ -338,18 +338,19 @@
 
 ;;; === Internal variables
 
-;; Regexp for mairix groups on back end
-(setq nnmairix-group-regexp (format "%s-\\(.*\\)-[0-9]+" 
nnmairix-group-prefix))
+(defconst nnmairix-group-regexp
+  (format "%s-\\(.*\\)-[0-9]+" nnmairix-group-prefix)
+  "Regexp for mairix groups on back end.")
+
+(defconst nnmairix-valid-backends '(nnimap nnml nnmaildir)
+  "Backends 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
   
@@ -845,6 +846,8 @@
          (set-process-sentinel (apply 'start-process args)
                                'nnmairix-sentinel-mairix-update-finished))))))
 
+(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
@@ -1169,8 +1172,7 @@
       (set-buffer nntp-server-buffer)
       (goto-char (point-min))
       (nnheader-message 7 "nnmairix: Rewriting headers...")
-      (mapcar
-       (function
+      (mapc
        (lambda (article)
          (when (or (looking-at (number-to-string article))
                    (nnheader-find-nov-line article))
@@ -1187,7 +1189,7 @@
            (nnheader-insert-nov cur)
            (set-buffer nntp-server-buffer)
            (when (not (eobp))
-             (forward-line 1)))))
+             (forward-line 1))))
        articles)
       (nnheader-message 7 "nnmairix: Rewriting headers... done")
       (kill-buffer nntp-server-buffer)
@@ -1344,7 +1346,7 @@
       (mapcar
        (function
        (lambda (field)
-         (list (caddr field)
+         (list (car (cddr field))
                (if (car field)
                    (nnmairix-replace-illegal-chars
                     (gnus-fetch-field (car field)))
@@ -1428,7 +1430,7 @@
     (dolist (cur nnmairix-widget-fields-list)
       ;; See if checkbox is checked
       (when (widget-value
-            (cadr (assoc (concat "c" (caddr cur)) widgets)))
+            (cadr (assoc (concat "c" (car (cddr cur))) widgets)))
        ;; create query for the field
        (push
         (concat
@@ -1436,7 +1438,7 @@
          ":"
          (nnmairix-replace-illegal-chars
           (widget-value
-          (cadr (assoc (concat "e" (caddr cur)) widgets)))))
+          (cadr (assoc (concat "e" (car (cddr cur))) widgets)))))
         query)))
     ;; Flags
     (when (member 'flags nnmairix-widget-other)
@@ -1500,7 +1502,7 @@
     (mapc
      (function
       (lambda (field)
-       (setq field (caddr field))
+       (setq field (car (cddr field)))
        (setq ret
              (nconc
               (list