summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-04-04 14:03:08 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-04-04 14:03:08 +0000
commitd451951a53a19d2a484cdf94b055c461b64be2c9 (patch)
tree3902485bc4ec27ccf68316e590c16b7c01df5369 /lisp
parent2fbc1934ae9a9610ef98578d59d478cb642363f9 (diff)
downloademacs-d451951a53a19d2a484cdf94b055c461b64be2c9.tar.gz
gnus-sum.el (gnus-update-marks): Reinstate the code to not alter marks on non-selected articles.
gnus-start.el (gnus-get-unread-articles): Don't try to contact denied servers.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog10
-rw-r--r--lisp/gnus/gnus-start.el4
-rw-r--r--lisp/gnus/gnus-sum.el11
3 files changed, 20 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 44c29256b7c..64cc6eb4f8b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus-sum.el (gnus-update-marks): Reinstate the code to not alter
+ marks on non-selected articles.
+
2011-04-02 Chong Yidong <cyd@stupidchicken.com>
* proto-stream.el: Move to Emacs core, at net/network-stream.el.
@@ -10,6 +15,11 @@
* mm-view.el (mm-display-inline-fontify): Do not fontify with
fundamental-mode.
+2011-04-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * gnus-start.el (gnus-get-unread-articles): Don't try to contact denied
+ servers.
+
2011-03-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-update-marks): Revert intersection change, which
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index afded87fe37..fa582c58aee 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/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.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 10aa4e12dcf..e3ae1d7f528 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/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-remove-from-range
- (gnus-copy-sequence list) old)))
+ (gnus-list-range-intersection
+ gnus-newsgroup-articles
+ (gnus-remove-from-range
+ (gnus-copy-sequence list) old))))
(when add
(push (list add 'add (list (cdr type))) delta-marks))
(when del