code diff between trunk and 5.10

[Miles Bader <miles@gnu.org>]

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)))