=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 4.34 retrieving revision 4.35 diff -u -p -r4.34 -r4.35 --- cvsweb/cvsweb.cgi 2019/11/29 16:30:06 4.34 +++ cvsweb/cvsweb.cgi 2019/11/29 18:15:48 4.35 @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id: cvsweb.cgi,v 4.34 2019/11/29 16:30:06 schwarze Exp $ +# $Id: cvsweb.cgi,v 4.35 2019/11/29 18:15:48 schwarze Exp $ # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon # # cvsweb - a CGI interface to CVS trees. @@ -68,8 +68,7 @@ use vars qw ( $bylog $byfile $defaultDiffType $logsort $cvstree $cvsroot $charset $output_filter %CMD $allow_compress $backicon $diricon $fileicon $fullname $logo $defaulttitle $address $binfileicon $iconsdir - $shortLogLen $show_author - $hr_breakable $showfunc $hr_ignwhite $hr_ignkeysubst + $shortLogLen $show_author $hr_breakable $hr_ignwhite $hr_ignkeysubst $inputTextSize $mime_types $allow_annotate $allow_markup $allow_mailtos $allow_log_extra $allow_dir_extra $allow_source_extra $edit_option_form @@ -203,7 +202,7 @@ $config = '/conf/cvsweb/cvsweb.conf'; $logo = $defaulttitle = $address = $shortLogLen = $show_author = - $hr_breakable = $showfunc = $hr_ignwhite = + $hr_breakable = $hr_ignwhite = $hr_ignkeysubst = $inputTextSize = $mime_types = $allow_annotate = $allow_markup = $allow_compress = $edit_option_form = $show_subdir_lastmod = $show_log_in_markup = $preformat_in_markup = @@ -2127,7 +2126,7 @@ sub doDiff($$$$$$) my $human_readable = $difftype->{colored}; # Apply special diff options. - push @difftype, '-p' if $showfunc; + push @difftype, '-p'; if ($human_readable) { push(@difftype, '-w') if $hr_ignwhite;