--- cvsweb.orig Sun Sep 18 17:30:10 2005 +++ cvsweb Sun Sep 18 17:49:41 2005 @@ -193,7 +193,7 @@ $LOG_FILESEPARATOR = q/^={77}$/; $LOG_REVSEPARATOR = q/^-{28}$/; -@DIFFTYPES = qw(h H u c); +@DIFFTYPES = qw(h H u c s); @DIFFTYPES{@DIFFTYPES} = ( { 'descr' => 'colored', @@ -215,6 +215,11 @@ 'opts' => ['-c'], 'colored' => 0, }, + { + 'descr' => 'side by side', + 'opts' => ['--side-by-side', '--width=164'], + 'colored' => 0, + }, ); @LOGSORTKEYS = qw(cvs date rev); @@ -2008,6 +2013,20 @@ my @difftype = @{$difftype->{'opts'}}; my $human_readable = $difftype->{'colored'}; + + # apply special options + if ($showfunc) { + push @difftype, '-p' if $f ne 's'; + + my ($re1, $re2); + + while (($re1, $re2) = each %funcline_regexp) { + if ($fullname =~ /$re1/) { + push @difftype, '-F', $re2; + last; + } + } + } if ($human_readable) { if ($hr_ignwhite) {