[gnus git] branch master updated: n0-13-124-g3e98424 =1= gnus-sum: use group parameter for list identifiers
Julien Danjou <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 3e984244f87246ee02285a2249c0426bef16b502 (commit)
from 1030afc46b2939a138b05ae479efb0f10cf12048 (commit)
- Log -----------------------------------------------------------------
commit 3e984244f87246ee02285a2249c0426bef16b502
Author: Julien Danjou <[email protected]>
Date: Wed Mar 16 15:59:27 2011 +0100
gnus-sum: use group parameter for list identifiers
Signed-off-by: Julien Danjou <[email protected]>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66afa88..8bdd2b1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-16 Julien Danjou <[email protected]>
+
+ * gnus-art.el (article-hide-list-identifiers): Use
+ gnus-group-get-list-identifiers.
+
+ * gnus-sum.el (gnus-group-get-list-identifiers): New function.
+ (gnus-summary-remove-list-identifiers): Use
+ gnus-group-get-list-identifiers to get regexp.
+ (gnus-select-newsgroup, gnus-summary-insert-subject)
+ (gnus-summary-insert-articles): Call
+ gnus-summary-remove-list-identifiers unconditionally.
+
2011-03-15 Lars Magne Ingebrigtsen <[email protected]>
* gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 20ffa8e..b994a28 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3076,10 +3076,7 @@ images if any to the browser, and deletes them when exiting the group
The `gnus-list-identifiers' variable specifies what to do."
(interactive)
(let ((inhibit-point-motion-hooks t)
- (regexp (or (gnus-parameter-list-identifier gnus-newsgroup-name)
- (if (consp gnus-list-identifiers)
- (mapconcat 'identity gnus-list-identifiers " *\\|")
- gnus-list-identifiers)))
+ (regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
(inhibit-read-only t))
(when regexp
(save-excursion
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 3854603..29a98b7 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -5510,11 +5510,16 @@ or a straight list of headers."
(cdr (assq number gnus-newsgroup-scored))
(memq number gnus-newsgroup-processable))))))
+(defun gnus-group-get-list-identifiers (group)
+ "Get list identifier regexp for GROUP."
+ (or (gnus-parameter-list-identifier group)
+ (if (consp gnus-list-identifiers)
+ (mapconcat 'identity gnus-list-identifiers " *\\|")
+ gnus-list-identifiers)))
+
(defun gnus-summary-remove-list-identifiers ()
"Remove list identifiers in `gnus-list-identifiers' from articles in the current group."
- (let ((regexp (if (consp gnus-list-identifiers)
- (mapconcat 'identity gnus-list-identifiers " *\\|")
- gnus-list-identifiers))
+ (let ((regexp (gnus-group-get-list-identifiers gnus-newsgroup-name))
changed subject)
(when regexp
(setq regexp (concat "^\\(?:R[Ee]: +\\)*\\(" regexp " *\\)"))
@@ -5707,8 +5712,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(when gnus-agent
(gnus-agent-get-undownloaded-list))
;; Remove list identifiers from subject
- (when gnus-list-identifiers
- (gnus-summary-remove-list-identifiers))
+ (gnus-summary-remove-list-identifiers)
;; Check whether auto-expire is to be done in this group.
(setq gnus-newsgroup-auto-expire
(gnus-group-auto-expirable-p group))
@@ -6576,9 +6580,8 @@ the subject line on."
(1+ (point-at-eol))
(gnus-delete-line))))))
;; Remove list identifiers from subject.
- (when gnus-list-identifiers
(let ((gnus-newsgroup-headers (list header)))
- (gnus-summary-remove-list-identifiers)))
+ (gnus-summary-remove-list-identifiers))
(when old-header
(mail-header-set-number header (mail-header-number old-header)))
(setq gnus-newsgroup-sparse
@@ -12682,8 +12685,7 @@ returned."
(when gnus-agent
(gnus-agent-get-undownloaded-list))
;; Remove list identifiers from subject
- (when gnus-list-identifiers
- (gnus-summary-remove-list-identifiers))
+ (gnus-summary-remove-list-identifiers)
;; First and last article in this newsgroup.
(when gnus-newsgroup-headers
(setq gnus-newsgroup-begin
-----------------------------------------------------------------------
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 | 12 ++++++++++++
lisp/gnus-art.el | 5 +----
lisp/gnus-sum.el | 24 +++++++++++++-----------
3 files changed, 26 insertions(+), 15 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