[gnus git] branch master updated: n0-15-34-g2a7d7ff =3= (gnus-update-marks): Reinstate the code to not alter marks on non-selected articles. ; (gnus-get-unread-articles): Don't try to contact denied servers. ; Resolve conflict.

       via  2a7d7ffcc61af85c058859a217e1f3c4d8254eda (commit)
       via  853d81e87dcdc0a4367450d9ce0a3fc67e247137 (commit)
       via  81d0af85518767484e38359b24d098bbc76880c4 (commit)
      from  60fcfe91c518207e97eb109555e9fc682210e8c6 (commit)


- Log -----------------------------------------------------------------
commit 2a7d7ffcc61af85c058859a217e1f3c4d8254eda
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Apr 3 18:44:10 2011 +0200

    (gnus-update-marks): Reinstate the code to not alter marks on non-selected articles.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fd8f54..bbac50e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-03  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus-sum.el (gnus-update-marks): Reinstate the code to not alter
+	marks on non-selected articles.
+
 2011-04-02  Chong Yidong  <[email protected]>
 
 	* nnimap.el (nnimap-open-connection-1): Pass explicit :end-of-command
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 10aa4e1..e3ae1d7 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6070,12 +6070,15 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 	  (let* ((old (cdr (assq (cdr type) (gnus-info-marks info))))
 		 ;; Don't do anything about marks for articles we
 		 ;; didn't actually get any headers for.
-		 (existing (gnus-compress-sequence gnus-newsgroup-articles))
 		 (del
-		  (gnus-remove-from-range (gnus-copy-sequence old) list))
+		  (gnus-list-range-intersection
+		   gnus-newsgroup-articles
+		   (gnus-remove-from-range (gnus-copy-sequence old) list)))
 		 (add
+		  (gnus-list-range-intersection
+		   gnus-newsgroup-articles
 		  (gnus-remove-from-range
-		   (gnus-copy-sequence list) old)))
+		    (gnus-copy-sequence list) old))))
 	    (when add
 	      (push (list add 'add (list (cdr type))) delta-marks))
 	    (when del

commit 853d81e87dcdc0a4367450d9ce0a3fc67e247137
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Fri Apr 1 21:29:47 2011 +0200

    (gnus-get-unread-articles): Don't try to contact denied servers.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index afded87..fa582c5 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1723,7 +1723,9 @@ If SCAN, request a scan of that group as well."
     ;; Do the rest of the retrieval.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos early-data) elem
-	(when (and method infos)
+	(when (and method infos
+		   (not (eq (gnus-server-status method)
+			    'denied)))
 	  (let ((updatep (gnus-check-backend-function
 			  'request-update-info (car method))))
 	    ;; See if any of the groups from this method require updating.

commit 81d0af85518767484e38359b24d098bbc76880c4
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Apr 3 18:43:08 2011 +0200

    Resolve conflict.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fd853e..6fd8f54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,11 @@
 	* mm-view.el (mm-display-inline-fontify): Do not fontify with
 	fundamental-mode.
 
+2011-04-01  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* gnus-start.el (gnus-get-unread-articles): Don't try to contact denied
+	servers.
+
 2011-03-30  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus-sum.el (gnus-update-marks): Revert intersection change, which

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog     |   10 ++++++++++
 lisp/gnus-start.el |    4 +++-
 lisp/gnus-sum.el   |   11 +++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project