From 81350f14c7234dec39d0fef592ee5f87901da9c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johan=20Bockg=C3=A5rd?= Date: Sun, 12 Apr 2015 22:40:46 +0000 Subject: [PATCH] gnus-sum.el (gnus-summary-refer-thread): Don't clobber unread articles This fixes a bug where `A T' causes "random" articles to become marked as read. --- lisp/ChangeLog | 7 ++++++- lisp/gnus-sum.el | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab7a2a824..651de2ff7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,9 @@ -2015-04-12 João Távora +2015-04-12 Johan BockgÃ¥rd + + * gnus-sum.el (gnus-summary-refer-thread): + Make sure gnus-newsgroup-unreads remains sorted. + +2015-04-12 João Távora Improve sexp-based movement in message-mode * message.el (message--syntax-propertize): New function. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index c68d49626..73a0d4b10 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -9068,22 +9068,24 @@ non-numeric or nil fetch the number specified by the (regexp-opt ',(append refs (list id subject))))))) (gnus-fetch-headers (list last) (if (numberp limit) (* 2 limit) limit) t)))) - article-ids) + article-ids new-unreads) (when (listp new-headers) (dolist (header new-headers) - (push (mail-header-number header) article-ids) - (when (member (mail-header-number header) gnus-newsgroup-unselected) - (push (mail-header-number header) gnus-newsgroup-unreads) - (setq gnus-newsgroup-unselected - (delete (mail-header-number header) - gnus-newsgroup-unselected)))) + (push (mail-header-number header) article-ids)) + (setq article-ids (nreverse article-ids)) + (setq new-unreads + (gnus-sorted-intersection gnus-newsgroup-unselected article-ids)) + (setq gnus-newsgroup-unselected + (gnus-sorted-ndifference gnus-newsgroup-unselected new-unreads)) + (setq gnus-newsgroup-unreads + (gnus-sorted-nunion gnus-newsgroup-unreads new-unreads)) (setq gnus-newsgroup-headers (gnus-delete-duplicate-headers (gnus-merge 'list gnus-newsgroup-headers new-headers 'gnus-article-sort-by-number))) (setq gnus-newsgroup-articles - (gnus-sorted-nunion gnus-newsgroup-articles (nreverse article-ids))) + (gnus-sorted-nunion gnus-newsgroup-articles article-ids)) (gnus-summary-limit-include-thread id))) (gnus-summary-show-thread)) -- 2.25.1