aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-03-31 13:31:56 +0000
committerKatsumi Yamaoka2011-03-31 13:31:56 +0000
commitd5b686dc3061ad1368d72da3d7494fc862cc46df (patch)
treedd9d309e87f2317020ee45e1eb7e7b85e62045dd
parent221ddf68cb70826c9cb889c44d7e97e9fc9ea856 (diff)
downloademacs-d5b686dc3061ad1368d72da3d7494fc862cc46df.tar.gz
emacs-d5b686dc3061ad1368d72da3d7494fc862cc46df.zip
gnus-sum.el (gnus-update-marks): Revert intersection change, which made marks not propagate, again.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-sum.el10
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 51169f7b9df..2496453dd89 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-03-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * gnus-sum.el (gnus-update-marks): Revert intersection change, which
4 made marks not propagate, again.
5
12011-03-30 Chong Yidong <cyd@stupidchicken.com> 62011-03-30 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * proto-stream.el (open-protocol-stream): Bring back `network' type. 8 * proto-stream.el (open-protocol-stream): Bring back `network' type.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 91dc6fb9595..10aa4e12dcf 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -6072,14 +6072,10 @@ If SELECT-ARTICLES, only select those articles from GROUP."
6072 ;; didn't actually get any headers for. 6072 ;; didn't actually get any headers for.
6073 (existing (gnus-compress-sequence gnus-newsgroup-articles)) 6073 (existing (gnus-compress-sequence gnus-newsgroup-articles))
6074 (del 6074 (del
6075 (gnus-sorted-range-intersection 6075 (gnus-remove-from-range (gnus-copy-sequence old) list))
6076 existing
6077 (gnus-remove-from-range (gnus-copy-sequence old) list)))
6078 (add 6076 (add
6079 (gnus-sorted-range-intersection 6077 (gnus-remove-from-range
6080 existing 6078 (gnus-copy-sequence list) old)))
6081 (gnus-remove-from-range
6082 (gnus-copy-sequence list) old))))
6083 (when add 6079 (when add
6084 (push (list add 'add (list (cdr type))) delta-marks)) 6080 (push (list add 'add (list (cdr type))) delta-marks))
6085 (when del 6081 (when del