code diff between trunk and 5.10

code diff between trunk and 5.10

[Miles Bader]

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

Re: code diff between trunk and 5.10

[Katsumi Yamaoka]

>>>>> In <61d5hnjf62.fsf@fencepost.gnu.org> Miles Bader wrote:

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

TSUCHIYA-san changed it in the trunk so that
`article-really-strip-banner' might be called only when the
regexp match is made.  It reduces unnecessary funcalls and will
make it slightly faster.  I didn't merge it into the v5-10
branch yesterday since those differences seem to be very little,
though.  If it is better to make them the same for the
convenience of management, I'll do it.

revision 7.30
date: 2004/05/06 13:34:04;  author: tsuchiya;  state: Exp;  lines: +14 -3
(article-strip-banner): Use MIME-encoded from fields
instead of MIME-decoded from fields when checking
`gnus-article-address-banner-alist', instead of calling
`gnus-fetch-original-field'.
----------------------------
revision 7.29
date: 2004/05/06 01:41:33;  author: tsuchiya;  state: Exp;  lines: +8 -12
(article-strip-banner): Use original from fields instead of
MIME-decoded from fields, when checking `gnus-article-address-banner-alist'.
----------------------------
revision 7.28

Re: code diff between trunk and 5.10

[Miles Bader]

Katsumi Yamaoka <yamaoka@jpl.org> writes:
> `article-really-strip-banner' might be called only when the regexp
> match is made.  It reduces unnecessary funcalls and will make it
> slightly faster.  I didn't merge it into the v5-10 branch yesterday
> since those differences seem to be very little, though.  If it is
> better to make them the same for the convenience of management, I'll
> do it.

If you could (or I can do it) -- it's always nice to reduce unnecessary
differences between the two branches.

Thanks,

-Miles
-- 
`There are more things in heaven and earth, Horatio,
 Than are dreamt of in your philosophy.'

Re: code diff between trunk and 5.10

[Katsumi Yamaoka]

>>>>> In <87zmkqhmob.fsf@catnip.gol.com> Miles Bader wrote:

> Katsumi Yamaoka <yamaoka@jpl.org> writes:
>> If it is better to make them the same for the convenience of
>> management, I'll do it.

> If you could (or I can do it) -- it's always nice to reduce unnecessary
> differences between the two branches.

I agree.  Now those are the same.