From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sun, 10 Oct 2010 19:37:34 +0000 (+0200)
Subject: (nnimap-update-info): Rely more on the current active than the param
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=0661509959b5bf873e14519923ed74ade86925ac;ds=sidebyside

(nnimap-update-info): Rely more on the current active than the param
active to avoid marking articles as read too much.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 06f683c1e..ff8a947e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if
 	available.
+	(nnimap-update-info): Rely more on the current active than the param
+	active to avoid marking articles as read too much.
 
 	* auth-source.el (auth-source-create): Use (user-login-name) for the
 	user name default.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 99aee4cdd..775b1bc05 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1066,8 +1066,8 @@ textual parts.")
       (let* ((group (gnus-info-group info))
 	     (completep (and start-article
 			     (= start-article 1)))
-	     (active (or (cdr (assq 'active (gnus-info-params info)))
-			 (gnus-active group))))
+	     (active (or (gnus-active group)
+			 (cdr (assq 'active (gnus-info-params info))))))
 	(when uidnext
 	  (setq high (1- uidnext)))
 	;; First set the active ranges based on high/low.