(nnimap-update-info): Clean up slightly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb01408..73bee4b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * nnimap.el (nnimap-update-info): Refactor slightly.
        (nnimap-update-info): Tell Gnus whether there are any \Recent messages.
+       (nnimap-update-info): Clean up slightly.
 
 2011-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 44ee790..6de49eb 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1226,33 +1226,32 @@ textual parts.")
             (completep (and start-article
                             (= start-article 1)))
             (active (or (gnus-active group)
-                        (cdr (assq 'active (gnus-info-params info)))))
-            new-active)
+                        (cdr (assq 'active (gnus-info-params info))))))
        (when uidnext
          (setq high (1- uidnext)))
        ;; First set the active ranges based on high/low.
-       (setq new-active
-             (if (or completep
-                     (not (gnus-active group)))
-                 (cond
-                  (active
-                   (cons (min (or low (car active))
-                              (car active))
-                         (max (or high (cdr active))
-                              (cdr active))))
-                  ((and low high)
-                   (cons low high))
-                  (uidnext
-                   ;; No articles in this group.
-                   (cons uidnext (1- uidnext)))
-                  (start-article
-                   (cons start-article (1- start-article)))
-                  (t
-                   ;; No articles and no uidnext.
-                   nil))
-               (cons (car active)
-                     (or high (1- uidnext)))))
-       (gnus-set-active group new-active)
+       (gnus-set-active
+        group
+        (if (or completep
+                (not (gnus-active group)))
+            (cond
+             (active
+              (cons (min (or low (car active))
+                         (car active))
+                    (max (or high (cdr active))
+                         (cdr active))))
+             ((and low high)
+              (cons low high))
+             (uidnext
+              ;; No articles in this group.
+              (cons uidnext (1- uidnext)))
+             (start-article
+              (cons start-article (1- start-article)))
+             (t
+              ;; No articles and no uidnext.
+              nil))
+          (cons (car active)
+                (or high (1- uidnext)))))
        ;; See whether this is a read-only group.
        (unless (eq permanent-flags 'not-scanned)
          (gnus-group-set-parameter