"f" => "sc" gives diff error

[Jon Noack]

On 2/23/2004 1:26 PM, Ville Skyttä wrote:
> On Mon, 2004-02-23 at 14:21, Jon Noack wrote:
> 
>>Setting "f" => "sc" results in this error when attempting to view a 
>>preferred diff:
>>/usr/bin/diff: conflicting specifications of output style
> 
> [...]
> 
>>diff - GNU diffutils version 2.7 (FreeBSD base system)
> 
> Yep, with Enscript colored side by side diffs, the -p option is
> erroneously passed to rcsdiff (and thus to diff).  And diff(1) from
> diffutils < 2.8 does not like that, while at least 2.8.1 seems to ignore
> it.  A quick fix against CVSweb 2.9.3 is attached.  Thanks for the
> report!

Good deal -- that works now.  The problem now (with enscript 
side-by-side) is that anything with lines ending in ">" (and possibly 
others) are treated as changed lines and colorized.  This pretty much 
makes it useless with html.  Oh well, I think I like the CVSweb 
side-by-side better anyway -- back to "uc".  Just thought you'd like to 
know...

Thanks again!
Jon Noack