From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (mandoc.bsd.lv [local])
	by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 3e95a18e
	for <source@mandoc.bsd.lv>;
	Sat, 9 Nov 2019 04:10:36 -0500 (EST)
Date: Sat, 9 Nov 2019 04:10:36 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: merge rev.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <8d0767cdb5296624@mandoc.bsd.lv>

Log Message:
-----------
merge rev. 3.119.2.10:
merge patch-cvsweb_cgi rev. 1.10 from the OpenBSD port, tweaked by me

original commit message:
date: 2003/08/16 18:12:10;  author: naddy;
excise functions that require GNU diff; prodding by jolan@

Modified Files:
--------------
    cvsweb:
        cvsweb.cgi

Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 4.1
retrieving revision 4.2
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.1 -r4.2
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -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 =
     '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;
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv