aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2013-01-14 22:09:16 +0000
committerKatsumi Yamaoka2013-01-14 22:09:16 +0000
commit982c5d68ff9a798d777d25ccfda7ca6616fab1e2 (patch)
tree8b3ae7f8f7f73453851caaad7e0bbd7d4bc79268
parentc50cf2eac4b18e38bef5b6e58827cc2bce1e98f4 (diff)
downloademacs-982c5d68ff9a798d777d25ccfda7ca6616fab1e2.tar.gz
emacs-982c5d68ff9a798d777d25ccfda7ca6616fab1e2.zip
gnus-sum.el: gnus-sum: fix `gnus-summary-from-or-to-or-newsgroups' address comparison
-rw-r--r--lisp/gnus/ChangeLog9
-rw-r--r--lisp/gnus/gnus-sum.el21
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 @@
12013-01-14 Julien Danjou <julien@danjou.info>
2
3 * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Compare
4 addresses against addresses, not against the full From field.
5
12013-01-13 Richard Stallman <rms@gnu.org> 62013-01-13 Richard Stallman <rms@gnu.org>
2 7
3 * message.el (message-forward-make-body-mime): New args BEG, END 8 * message.el (message-forward-make-body-mime): New args BEG, END
@@ -7,10 +12,10 @@
72013-01-11 Aaron S. Hawley <Aaron.Hawley@vtinfo.com> 122013-01-11 Aaron S. Hawley <Aaron.Hawley@vtinfo.com>
8 13
9 * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string 14 * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
10 cross-reference(s). 15 cross-reference(s).
11 16
12 * gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string 17 * gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
13 cross-reference(s). 18 cross-reference(s).
14 19
152013-01-11 Dmitry Antipov <dmantipov@yandex.ru> 202013-01-11 Dmitry Antipov <dmantipov@yandex.ru>
16 21
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."
3651 (or (car (funcall gnus-extract-address-components from)) 3651 (or (car (funcall gnus-extract-address-components from))
3652 from)) 3652 from))
3653 3653
3654(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-from) 3654(defun gnus-summary-from-or-to-or-newsgroups (header from)
3655 (let ((mail-parse-charset gnus-newsgroup-charset) 3655 (let ((mail-parse-charset gnus-newsgroup-charset)
3656 (ignored-from-addresses (gnus-ignored-from-addresses)) 3656 (ignored-from-addresses (gnus-ignored-from-addresses))
3657 ; Is it really necessary to do this next part for each summary line? 3657 ;; Is it really necessary to do this next part for each summary line?
3658 ; Luckily, doesn't seem to slow things down much. 3658 ;; Luckily, doesn't seem to slow things down much.
3659 (mail-parse-ignored-charsets 3659 (mail-parse-ignored-charsets
3660 (with-current-buffer gnus-summary-buffer 3660 (with-current-buffer gnus-summary-buffer
3661 gnus-newsgroup-ignored-charsets))) 3661 gnus-newsgroup-ignored-charsets))
3662 (address (cadr (gnus-extract-address-components from))))
3662 (or 3663 (or
3663 (and ignored-from-addresses 3664 (and ignored-from-addresses
3664 (string-match ignored-from-addresses gnus-tmp-from) 3665 (string-match ignored-from-addresses address)
3665 (let ((extra-headers (mail-header-extra header)) 3666 (let ((extra-headers (mail-header-extra header))
3666 to 3667 to
3667 newsgroups) 3668 newsgroups)
@@ -3680,9 +3681,7 @@ buffer that was in action when the last article was fetched."
3680 gnus-newsgroup-name)) 'nntp) 3681 gnus-newsgroup-name)) 'nntp)
3681 (gnus-group-real-name gnus-newsgroup-name)))) 3682 (gnus-group-real-name gnus-newsgroup-name))))
3682 (concat gnus-summary-newsgroup-prefix newsgroups))))) 3683 (concat gnus-summary-newsgroup-prefix newsgroups)))))
3683 (gnus-string-mark-left-to-right 3684 (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from)))))
3684 (inline
3685 (gnus-summary-extract-address-component gnus-tmp-from))))))
3686 3685
3687(defun gnus-summary-insert-line (gnus-tmp-header 3686(defun gnus-summary-insert-line (gnus-tmp-header
3688 gnus-tmp-level gnus-tmp-current 3687 gnus-tmp-level gnus-tmp-current