From 982c5d68ff9a798d777d25ccfda7ca6616fab1e2 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 14 Jan 2013 22:09:16 +0000 Subject: [PATCH] gnus-sum.el: gnus-sum: fix `gnus-summary-from-or-to-or-newsgroups' address comparison --- lisp/gnus/ChangeLog | 9 +++++++-- lisp/gnus/gnus-sum.el | 21 ++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 1524f000450..2b09a1f456c 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2013-01-14 Julien Danjou + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Compare + addresses against addresses, not against the full From field. + 2013-01-13 Richard Stallman * message.el (message-forward-make-body-mime): New args BEG, END @@ -7,10 +12,10 @@ 2013-01-11 Aaron S. Hawley * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string - cross-reference(s). + cross-reference(s). * gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string - cross-reference(s). + cross-reference(s). 2013-01-11 Dmitry Antipov diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 14597f031e1..ea68a6a2fa5 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -3651,17 +3651,18 @@ buffer that was in action when the last article was fetched." (or (car (funcall gnus-extract-address-components from)) from)) -(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-from) +(defun gnus-summary-from-or-to-or-newsgroups (header from) (let ((mail-parse-charset gnus-newsgroup-charset) - (ignored-from-addresses (gnus-ignored-from-addresses)) - ; Is it really necessary to do this next part for each summary line? - ; Luckily, doesn't seem to slow things down much. - (mail-parse-ignored-charsets - (with-current-buffer gnus-summary-buffer - gnus-newsgroup-ignored-charsets))) + (ignored-from-addresses (gnus-ignored-from-addresses)) + ;; Is it really necessary to do this next part for each summary line? + ;; Luckily, doesn't seem to slow things down much. + (mail-parse-ignored-charsets + (with-current-buffer gnus-summary-buffer + gnus-newsgroup-ignored-charsets)) + (address (cadr (gnus-extract-address-components from)))) (or (and ignored-from-addresses - (string-match ignored-from-addresses gnus-tmp-from) + (string-match ignored-from-addresses address) (let ((extra-headers (mail-header-extra header)) to newsgroups) @@ -3680,9 +3681,7 @@ buffer that was in action when the last article was fetched." gnus-newsgroup-name)) 'nntp) (gnus-group-real-name gnus-newsgroup-name)))) (concat gnus-summary-newsgroup-prefix newsgroups))))) - (gnus-string-mark-left-to-right - (inline - (gnus-summary-extract-address-component gnus-tmp-from)))))) + (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from))))) (defun gnus-summary-insert-line (gnus-tmp-header gnus-tmp-level gnus-tmp-current -- 2.39.5