Merge branch 'rh/maint-gitweb-highlight-ext' into maint

Syntax highlighting in "gitweb" was not quite working.

* rh/maint-gitweb-highlight-ext:
  gitweb.perl: fix %highlight_ext mappings
This commit is contained in:
Junio C Hamano 2012-11-28 12:05:30 -08:00
commit 1d05d1ded0

View File

@ -270,16 +270,15 @@ our %highlight_basename = (
our %highlight_ext = ( our %highlight_ext = (
# main extensions, defining name of syntax; # main extensions, defining name of syntax;
# see files in /usr/share/highlight/langDefs/ directory # see files in /usr/share/highlight/langDefs/ directory
map { $_ => $_ } (map { $_ => $_ } qw(py rb java css js tex bib xml awk bat ini spec tcl sql)),
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 # alternate extensions, see /etc/highlight/filetypes.conf
'h' => 'c', (map { $_ => 'c' } qw(c h)),
map { $_ => 'sh' } qw(bash zsh ksh), (map { $_ => 'sh' } qw(sh bash zsh ksh)),
map { $_ => 'cpp' } qw(cxx c++ cc), (map { $_ => 'cpp' } qw(cpp cxx c++ cc)),
map { $_ => 'php' } qw(php3 php4 php5 phps), (map { $_ => 'php' } qw(php php3 php4 php5 phps)),
map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi' (map { $_ => 'pl' } qw(pl perl pm)), # perhaps also 'cgi'
map { $_ => 'make'} qw(mak mk), (map { $_ => 'make'} qw(make mak mk)),
map { $_ => 'xml' } qw(xhtml html htm), (map { $_ => 'xml' } qw(xml xhtml html htm)),
); );
# You define site-wide feature defaults here; override them with # You define site-wide feature defaults here; override them with