diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-28 12:05:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-28 12:05:30 -0800 |
commit | 1d05d1ded0d9bc3ededcb3a54b0419e1b9d2b2d7 (patch) | |
tree | 0ab3e49cc2b784913af342d9406312c0950e22b9 /gitweb | |
parent | 2a7f6ffb9168c2e0d1f4ca9c1b63357e431093e9 (diff) | |
parent | 048b3991924a0666a2ab4f381caac8d62962de38 (diff) | |
download | git-1d05d1ded0d9bc3ededcb3a54b0419e1b9d2b2d7.tar.gz git-1d05d1ded0d9bc3ededcb3a54b0419e1b9d2b2d7.tar.xz |
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
Diffstat (limited to 'gitweb')
-rwxr-xr-x | gitweb/gitweb.perl | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index a51a8babe..e8812fa2b 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -270,16 +270,15 @@ our %highlight_basename = ( 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 sql make), + (map { $_ => $_ } qw(py rb java css js tex bib xml awk bat ini spec tcl sql)), # 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 php5 phps), - map { $_ => 'pl' } qw(perl pm), # perhaps also 'cgi' - map { $_ => 'make'} qw(mak mk), - map { $_ => 'xml' } qw(xhtml html htm), + (map { $_ => 'c' } qw(c h)), + (map { $_ => 'sh' } qw(sh bash zsh ksh)), + (map { $_ => 'cpp' } qw(cpp cxx c++ cc)), + (map { $_ => 'php' } qw(php php3 php4 php5 phps)), + (map { $_ => 'pl' } qw(pl perl pm)), # perhaps also 'cgi' + (map { $_ => 'make'} qw(make mak mk)), + (map { $_ => 'xml' } qw(xml xhtml html htm)), ); # You define site-wide feature defaults here; override them with |