summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-sum.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2013-07-03 04:15:38 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2013-07-03 04:15:38 +0000
commit527769f7ede3788154e709befd8f8127d8b1832a (patch)
tree6e68d141a52bbabace8d70a4d1158e54c7051339 /lisp/gnus/gnus-sum.el
parent1399490e2bb58e1e7212d7a8469e1286ced9423a (diff)
downloademacs-527769f7ede3788154e709befd8f8127d8b1832a.tar.gz
gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Revert 2013-01-14 change
Diffstat (limited to 'lisp/gnus/gnus-sum.el')
-rw-r--r--lisp/gnus/gnus-sum.el25
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e136d4f8173..9bae9f981bd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3657,18 +3657,17 @@ 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 from)
+(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-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))
- (address (cadr (gnus-extract-address-components from))))
+ (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)))
(or
(and ignored-from-addresses
- (string-match ignored-from-addresses address)
+ (string-match ignored-from-addresses gnus-tmp-from)
(let ((extra-headers (mail-header-extra header))
to
newsgroups)
@@ -3683,11 +3682,13 @@ buffer that was in action when the last article was fetched."
(cdr (assq 'Newsgroups extra-headers))
(and
(memq 'Newsgroups gnus-extra-headers)
- (eq (car (gnus-find-method-for-group
- gnus-newsgroup-name)) 'nntp)
+ (eq (car (gnus-find-method-for-group
+ gnus-newsgroup-name)) 'nntp)
(gnus-group-real-name gnus-newsgroup-name))))
(concat gnus-summary-newsgroup-prefix newsgroups)))))
- (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from)))))
+ (gnus-string-mark-left-to-right
+ (inline
+ (gnus-summary-extract-address-component gnus-tmp-from))))))
(defun gnus-summary-insert-line (gnus-tmp-header
gnus-tmp-level gnus-tmp-current