Merge branch 'jc/convert'

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 60cb772c5834255acabe5eb61d83787fc91f96a0..66eadb4ab2939b193fcf84d8d805e0b29ad5e9d2 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -186,7 +186,7 @@ sub evaluate_uri {
                'type' => 'application/x-gzip',
                'suffix' => '.tar.gz',
                'format' => 'tar',
-               'compressor' => ['gzip']},
+               'compressor' => ['gzip', '-n']},
 
        'tbz2' => {
                'display' => 'tar.bz2',
@@ -2653,6 +2653,7 @@ sub git_populate_project_tagcloud {
        }
 
        my $cloud;
+       my $matched = $cgi->param('by_tag');
        if (eval { require HTML::TagCloud; 1; }) {
                $cloud = HTML::TagCloud->new;
                foreach my $ctag (sort keys %ctags_lc) {
@@ -2662,17 +2663,22 @@ sub git_populate_project_tagcloud {
                        $title =~ s/ / /g;
                        $title =~ s/^/ /g;
                        $title =~ s/$/ /g;
+                       if (defined $matched && $matched eq $ctag) {
+                               $title = qq(<span class="match">$title</span>);
+                       }
                        $cloud->add($title, href(project=>undef, ctag=>$ctag),
                                    $ctags_lc{$ctag}->{count});
                }
        } else {
                $cloud = {};
                foreach my $ctag (keys %ctags_lc) {
-                       my $title = $ctags_lc{$ctag}->{topname};
+                       my $title = esc_html($ctags_lc{$ctag}->{topname}, -nbsp=>1);
+                       if (defined $matched && $matched eq $ctag) {
+                               $title = qq(<span class="match">$title</span>);
+                       }
                        $cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
                        $cloud->{$ctag}{ctag} =
-                               $cgi->a({-href=>href(project=>undef, ctag=>$ctag)},
-                                 esc_html($title, -nbsp=>1));
+                               $cgi->a({-href=>href(project=>undef, ctag=>$ctag)}, $title);
                }
        }
        return $cloud;