===================================================================
RCS file: /cvs/cvsweb/cvsweb.cgi,v
retrieving revision 4.1
retrieving revision 4.2
diff -u -p -r4.1 -r4.2
--- cvsweb/cvsweb.cgi	2019/11/08 21:08:26	4.1
+++ cvsweb/cvsweb.cgi	2019/11/09 09:10:05	4.2
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $Id: cvsweb.cgi,v 4.1 2019/11/08 21:08:26 schwarze Exp $
+# $Id: cvsweb.cgi,v 4.2 2019/11/09 09:10:05 schwarze Exp $
 # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon
 #
 # cvsweb - a CGI interface to CVS trees.
@@ -65,7 +65,7 @@ use vars qw (
   @revisions %state %difflines %log %branchpoint @revorder $keywordsubstitution
   $prcgi @prcategories $re_prcategories $prkeyword $re_prkeyword $mancgi
   $doCheckout $scriptname $scriptwhere
-  $where $Browser $nofilelinks $maycompress @stickyvars %funcline_regexp
+  $where $Browser $nofilelinks $maycompress @stickyvars
   $is_links $is_lynx $is_w3m $is_msie $is_mozilla3 $is_textbased
   %input $query $barequery $sortby $bydate $byrev $byauthor
   $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot
@@ -237,7 +237,7 @@ $cvstreedefault = $logo = $defaulttitle =
 
 $allow_version_select = $allow_mailtos = $allow_log_extra = 1;
 
-@DIFFTYPES = qw(h H u c s);
+@DIFFTYPES = qw(h H u c);
 @DIFFTYPES{@DIFFTYPES} = (
   {
     'descr'   => 'colored',
@@ -259,12 +259,6 @@ $allow_version_select = $allow_mailtos = $allow_log_ex
     'opts'    => ['-c'],
     'colored' => 0,
   },
-  {
-    'descr'   => 'side by side',
-    # width=168 should be enough to support 80 character line lengths
-    'opts'    => ['--side-by-side', '--width=168'],
-    'colored' => 0,
-  },
 );
 
 @LOGSORTKEYS = qw(cvs date rev);
@@ -555,8 +549,8 @@ foreach (@stickyvars) {
 }
 
 if ($allow_enscript) {
-  push(@DIFFTYPES, qw(uc cc sc));
-  @DIFFTYPES{qw(uc cc sc)} = (
+  push(@DIFFTYPES, qw(uc cc));
+  @DIFFTYPES{qw(uc cc)} = (
     {
      'descr'   => 'unified, colored',
      'opts'    => ['-u'],
@@ -567,12 +561,6 @@ if ($allow_enscript) {
      'opts'    => ['-c'],
      'colored' => 0,
     },
-    {
-     'descr'   => 'side by side, colored',
-     # width=168 should be enough to support 80 character line lengths
-     'opts'    => ['--side-by-side', '--width=168'],
-     'colored' => 0,
-    },
   );
 } else {
   # No Enscript -> respect difftype, but don't offer colorization.
@@ -2319,18 +2307,8 @@ sub doDiff($$$$$$)
   my @difftype       = @{$difftype->{opts}};
   my $human_readable = $difftype->{colored};
 
-  # Apply special diff options.  -p and -F are not available with side by side
-  # diffs and may cause problems with older (< 2.8) versions of diffutils if
-  # used with --side-by-side.
-  if ($showfunc && $f !~ /^s/) {
-    push(@difftype, '-p');
-    while (my ($re1, $re2) = each %funcline_regexp) {
-      if ($fullname =~ $re1) {
-        push(@difftype, '-F', $re2);
-        last;
-      }
-    }
-  }
+  # Apply special diff options.
+  push @difftype, '-p' if $showfunc;
 
   if ($human_readable) {
     push(@difftype, '-w')  if $hr_ignwhite;