Merge branch 'sr/gitweb-hilite-more'
* sr/gitweb-hilite-more: gitweb: remove unnecessary test when closing file descriptor gitweb: add extensions to highlight feature map
This commit is contained in:
commit
17fd68d0d8
@ -250,13 +250,14 @@ our %highlight_ext = (
|
||||
# main extensions, defining name of syntax;
|
||||
# see files in /usr/share/highlight/langDefs/ directory
|
||||
map { $_ => $_ }
|
||||
qw(py c cpp rb java css php sh pl js tex bib xml awk bat ini spec tcl),
|
||||
qw(py c cpp rb java css php sh pl js tex bib xml awk bat ini spec tcl sql make),
|
||||
# alternate extensions, see /etc/highlight/filetypes.conf
|
||||
'h' => 'c',
|
||||
map { $_ => 'sh' } qw(bash zsh ksh),
|
||||
map { $_ => 'cpp' } qw(cxx c++ cc),
|
||||
map { $_ => 'php' } qw(php3 php4),
|
||||
map { $_ => 'php' } qw(php3 php4 php5 phps),
|
||||
map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi'
|
||||
'mak' => 'make',
|
||||
map { $_ => 'make'} qw(mak mk),
|
||||
map { $_ => 'xml' } qw(xhtml html htm),
|
||||
);
|
||||
|
||||
@ -3464,8 +3465,7 @@ sub run_highlighter {
|
||||
my ($fd, $highlight, $syntax) = @_;
|
||||
return $fd unless ($highlight && defined $syntax);
|
||||
|
||||
close $fd
|
||||
or die_error(404, "Reading blob failed");
|
||||
close $fd;
|
||||
open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
|
||||
quote_command($highlight_bin).
|
||||
" --xhtml --fragment --syntax $syntax |"
|
||||
|
Loading…
Reference in New Issue
Block a user