git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] gitweb: add extensions to highlight feature

From
Sylvain Rabot <sylvain@abstraction.fr>
Date
Dec 16, 2010, 22:33 UTC
Message-ID
<1292538804.2511.4.camel@kheops>
In-Reply-To
<m3y68slxj9.fsf@localhost.localdomain>
On Thu, 2010-12-16 at 14:22 -0800, Jakub Narebski wrote:
Show 29 quoted lines
> Sylvain Rabot <sylvain@abstraction.fr> writes:
> 
> > added: sql, php5, phps, bash, zsh, mk
> > 
> 
> There is one issue with this patch (see below), but otherwise I like
> it.
> 
> > Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
> > ---
> >  gitweb/gitweb.perl |    7 ++++---
> >  1 files changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> > index d521c93..db18d06 100755
> > --- a/gitweb/gitweb.perl
> > +++ b/gitweb/gitweb.perl
> > @@ -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 pl js tex bib xml awk bat ini spec tcl sql),
> 
> Why did you remove 'sh' => 'sh' mapping?  Shouldn't it be
> 
>   -		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),
> 

I removed it on purpose but should have not, I was thinking the mapping made below would be enough but no, you're right.

Show 5 quoted lines
> >  	# alternate extensions, see /etc/highlight/filetypes.conf
> >  	'h' => 'c',
> > +	map { $_ => 'sh'  } qw(bash zsh),
> 
> Good idea.
Does ksh, csh can be highlighted as sh too ?
Show 14 quoted lines
> 
> >  	map { $_ => 'cpp' } qw(cxx c++ cc),
> > -	map { $_ => 'php' } qw(php3 php4),
> > +	map { $_ => 'php' } qw(php3 php4 php5 phps),
> 
> Good idea.
> 
> >  	map { $_ => 'pl'  } qw(perl pm), # perhaps also 'cgi'
> > -	'mak' => 'make',
> > +	map { $_ => 'make'} qw(mak mk),
> 
> Good idea.
> 
> Sidenote: git itself uses *.mak extension.  Is *.mk popular?

Don't know but mk is mapped to Makefiles in the gtksourceview lib so I added it here.

Show 8 quoted lines
> 
> >  	map { $_ => 'xml' } qw(xhtml html htm),
> >  );
> >  
> > -- 
> > 1.7.3.2
> > 
> 
-- 
Sylvain Rabot <sylvain@abstraction.fr>
Previous: Jakub NarebskiNext: Jakub Narebski
Message 4 of 12 in “minor gitweb modifications”
  1. 0/3 minor gitweb modificationsSylvain Rabot, Dec 16, 2010
  2. 1/3 gitweb: add extensions to highlight featureSylvain Rabot, Dec 16, 2010
  3. Jakub NarebskiDec 16, 2010
  4. Sylvain RabotDec 16, 2010
  5. Jakub NarebskiDec 17, 2010
  6. 2/3 gitweb: decorate a bit more remotesSylvain Rabot, Dec 16, 2010
  7. Jakub NarebskiDec 16, 2010
  8. Drew NorthupDec 20, 2010
  9. 3/3 gitweb: remove test when closing file descriptorSylvain Rabot, Dec 16, 2010
  10. Jakub NarebskiDec 16, 2010
  11. Sylvain RabotDec 16, 2010
  12. Jakub NarebskiNov 16, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.