From mboxrd@z Thu Jan  1 00:00:00 1970
X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/62010
Path: news.gmane.org!not-for-mail
From: Miles Bader <miles@gnu.org>
Newsgroups: gmane.emacs.gnus.general
Subject: code diff between trunk and 5.10
Date: Thu, 16 Feb 2006 14:07:33 -0500
Message-ID: <61d5hnjf62.fsf@fencepost.gnu.org>
NNTP-Posting-Host: main.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: sea.gmane.org 1140117113 7411 80.91.229.2 (16 Feb 2006 19:11:53 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Thu, 16 Feb 2006 19:11:53 +0000 (UTC)
Original-X-From: ding-owner+m10538@lists.math.uh.edu Thu Feb 16 20:11:46 2006
Return-path: <ding-owner+m10538@lists.math.uh.edu>
Envelope-to: ding-account@gmane.org
Original-Received: from malifon.math.uh.edu ([129.7.128.13])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1F9oXL-0005qZ-Is
	for ding-account@gmane.org; Thu, 16 Feb 2006 20:11:32 +0100
Original-Received: from localhost
	([127.0.0.1] helo=lists.math.uh.edu ident=lists)
	by malifon.math.uh.edu with smtp (Exim 3.20 #1)
	id 1F9oXE-0007NR-00; Thu, 16 Feb 2006 13:11:24 -0600
Original-Received: from nas01.math.uh.edu ([129.7.128.39])
	by malifon.math.uh.edu with esmtp (Exim 3.20 #1)
	id 1F9oTZ-0007NM-00
	for ding@lists.math.uh.edu; Thu, 16 Feb 2006 13:07:37 -0600
Original-Received: from quimby.gnus.org ([80.91.224.244])
	by nas01.math.uh.edu with esmtp (Exim 4.52)
	id 1F9oTY-0005HY-5o
	for ding@lists.math.uh.edu; Thu, 16 Feb 2006 13:07:37 -0600
Original-Received: from fencepost.gnu.org ([199.232.76.164])
	by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian))
	id 1F9oTW-00055y-00
	for <ding@gnus.org>; Thu, 16 Feb 2006 20:07:34 +0100
Original-Received: from miles by fencepost.gnu.org with local (Exim 4.34)
	id 1F9oTV-0005Zt-Qe; Thu, 16 Feb 2006 14:07:33 -0500
Original-To: ding@gnus.org
System-Type: i686-pc-linux-gnu
Blat: Foop
X-Spam-Score: -2.6 (--)
Precedence: bulk
Original-Sender: ding-owner@lists.math.uh.edu
Xref: news.gmane.org gmane.emacs.gnus.general:62010
Archived-At: <http://permalink.gmane.org/gmane.emacs.gnus.general/62010>

lisp/gnus-art.el has the following difference between the two branches,
inside `article-strip-banner'; the code is the same, except that in the
trunk, `article-really-strip-banner' is called from the "throw", whereas in
5.10 it's unconditionally called.  As the non-throw case presumably only
results in nil, the two methods may actually be equivalent in effect.

Is this difference intentional, or just an accident?

Thanks,

-Miles

<<<<<<< TREE
	  (let ((from (save-restriction
			(widen)
			(article-narrow-to-head)
			(mail-fetch-field "from"))))
	    (when (and from
		       (setq from
			     (cadr (funcall gnus-extract-address-components
					    from))))
	      (catch 'found
		(dolist (pair gnus-article-address-banner-alist)
		  (when (string-match (car pair) from)
		    (throw 'found
			   (article-really-strip-banner (cdr pair)))))))))))))
=======
	  (article-really-strip-banner
	   (let ((from (save-restriction
			 (widen)
			 (article-narrow-to-head)
			 (mail-fetch-field "from"))))
	     (when (and from
			(setq from
			      (cadr (funcall gnus-extract-address-components
					     from))))
	       (catch 'found
		 (dolist (pair gnus-article-address-banner-alist)
		   (when (string-match (car pair) from)
		     (throw 'found (cdr pair)))))))))))))
>>>>>>> MERGE-SOURCE


-- 
((lambda (x) (list x x)) (lambda (x) (list x x)))