aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-10-23 16:29:35 +0000
committerChong Yidong2005-10-23 16:29:35 +0000
commit7cd9f860a99995cf28d7bf956cac2229a142efa6 (patch)
treef10d548e5d3d80cda4e93c6e337b36f55cff4f19
parent2a0d53ac48a8306d85f985011910ea25a15f1521 (diff)
downloademacs-7cd9f860a99995cf28d7bf956cac2229a142efa6.tar.gz
emacs-7cd9f860a99995cf28d7bf956cac2229a142efa6.zip
Reverted last change for a better fix:
* gnus-sum.el (gnus-ignored-from-addresses): Handle case where user-mail-name is an empty string.
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/gnus-sum.el5
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3e82ae07120..ee4c34d9444 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,7 @@
12005-10-23 Chong Yidong <cyd@stupidchicken.com> 12005-10-23 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Handle case 3 * gnus-sum.el (gnus-ignored-from-addresses): Handle case where
4 where gnus-ignored-from-address is an empty string. 4 user-mail-name is an empty string.
5 5
62005-10-20 Hiroshi Fujishima <hiroshi.fujishima@gmail.com> (tiny change) 62005-10-20 Hiroshi Fujishima <hiroshi.fujishima@gmail.com> (tiny change)
7 7
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 3bcbf82d93c..51f03061d4f 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1000,7 +1000,9 @@ which it may alter in any way."
1000 :type '(repeat symbol)) 1000 :type '(repeat symbol))
1001 1001
1002(defcustom gnus-ignored-from-addresses 1002(defcustom gnus-ignored-from-addresses
1003 (and user-mail-address (regexp-quote user-mail-address)) 1003 (and user-mail-address
1004 (not (string= user-mail-address ""))
1005 (regexp-quote user-mail-address))
1004 "*Regexp of From headers that may be suppressed in favor of To headers." 1006 "*Regexp of From headers that may be suppressed in favor of To headers."
1005 :version "21.1" 1007 :version "21.1"
1006 :group 'gnus-summary 1008 :group 'gnus-summary
@@ -3304,7 +3306,6 @@ buffer that was in action when the last article was fetched."
3304 gnus-newsgroup-ignored-charsets))) 3306 gnus-newsgroup-ignored-charsets)))
3305 (or 3307 (or
3306 (and gnus-ignored-from-addresses 3308 (and gnus-ignored-from-addresses
3307 (not (string= gnus-ignored-from-addresses ""))
3308 (string-match gnus-ignored-from-addresses gnus-tmp-from) 3309 (string-match gnus-ignored-from-addresses gnus-tmp-from)
3309 (let ((extra-headers (mail-header-extra header)) 3310 (let ((extra-headers (mail-header-extra header))
3310 to 3311 to