From: yamaoka <yamaoka>
Date: Thu, 6 May 2004 06:40:40 +0000 (+0000)
Subject: Synch to No Gnus 200405060141.
X-Git-Tag: t-gnus-6_17_4-quimby-~946
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75294d11d022f35c3c3fa3d818c92a59e1d8e2f7;p=elisp%2Fgnus.git-

Synch to No Gnus 200405060141.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b54b27f..b8d51e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-06  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* gnus-art.el (article-strip-banner): Use original from fields
+	instead of MIME-decoded from fields, when checking
+	`gnus-article-address-banner-alist'.
+
 2004-05-03  Jesper Harder  <harder@ifa.au.dk>
 
 	* nnrss.el (nnrss-check-group, nnrss-read-group-data): Hash on
@@ -5,7 +11,7 @@
 
 2004-05-02  Steve Youngs  <steve@youngs.au.com>
 
-	* dgnushack.el: Autoload `mail-fetch-field' for	XEmacs. 
+	* dgnushack.el: Autoload `mail-fetch-field' for XEmacs.
 
 2004-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -18,7 +24,7 @@
 2004-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-agent.el (gnus-agent-read-agentview): Inline
-	gnus-uncompress-range. 
+	gnus-uncompress-range.
 
 2004-05-01  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 99288aa..b3f65a2 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -2624,18 +2624,14 @@ always hide."
 	  (article-really-strip-banner
 	   (gnus-parameter-banner gnus-newsgroup-name)))
 	(when gnus-article-address-banner-alist
-	  (article-really-strip-banner
-	   (let ((from (save-restriction
-			 (widen)
-			 (article-narrow-to-head)
-			 (mail-fetch-field "from"))))
-	     (when (and from
-			(setq from
-			      (caar (mail-header-parse-addresses from))))
-	       (catch 'found
-		 (dolist (pair gnus-article-address-banner-alist)
-		   (when (string-match (car pair) from)
-		     (throw 'found (cdr pair)))))))))))))
+	  (let ((from (caar (mail-header-parse-addresses
+			     (gnus-fetch-original-field "from")))))
+	    (when from
+	      (catch 'found
+		(dolist (pair gnus-article-address-banner-alist)
+		  (when (string-match (car pair) from)
+		    (throw 'found
+			   (article-really-strip-banner (cdr pair)))))))))))))
 
 (defun article-really-strip-banner (banner)
   "Strip the banner specified by the argument."