git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ian Kelling <ian@iankelling.org>
To: git@vger.kernel.org
Cc: jnareb@gmail.com
Subject: [PATCH v4 1/2] gitweb: remove unused guess_file_syntax() parameter
Date: Sat, 24 Sep 2016 15:32:57 -0700	[thread overview]
Message-ID: <20160924223258.9449-1-ian@iankelling.org> (raw)
In-Reply-To: <20160923090846.3086-2-ian@iankelling.org>

Signed-off-by: Ian Kelling <ian@iankelling.org>
---

Notes:
    The only change from v3 is a more descriptive commit message

 gitweb/gitweb.perl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 33d701d..6cb4280 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3913,7 +3913,7 @@ sub blob_contenttype {
 # guess file syntax for syntax highlighting; return undef if no highlighting
 # the name of syntax can (in the future) depend on syntax highlighter used
 sub guess_file_syntax {
-	my ($highlight, $mimetype, $file_name) = @_;
+	my ($highlight, $file_name) = @_;
 	return undef unless ($highlight && defined $file_name);
 	my $basename = basename($file_name, '.in');
 	return $highlight_basename{$basename}
@@ -7062,7 +7062,7 @@ sub git_blob {
 	$have_blame &&= ($mimetype =~ m!^text/!);
 
 	my $highlight = gitweb_check_feature('highlight');
-	my $syntax = guess_file_syntax($highlight, $mimetype, $file_name);
+	my $syntax = guess_file_syntax($highlight, $file_name);
 	$fd = run_highlighter($fd, $highlight, $syntax)
 		if $syntax;
 
-- 
2.9.3


  parent reply	other threads:[~2016-09-24 22:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-06 19:00 [PATCH] gitweb: use highlight's shebang detection Ian Kelling
2016-09-20 20:22 ` Jakub Narębski
2016-09-21 16:38   ` Junio C Hamano
2016-09-21 17:51     ` Jakub Narębski
2016-09-21 22:15   ` Ian Kelling
2016-09-21 22:18   ` Ian Kelling
2016-09-21 22:24     ` Ian Kelling
2016-09-22 22:50     ` [PATCH v2] " Jakub Narębski
2016-09-23  9:08       ` Ian Kelling
2016-09-23  9:08       ` [PATCH v3 1/2] gitweb: remove unused function parameter Ian Kelling
2016-09-23  9:08         ` [PATCH v3 2/2] gitweb: use highlight's shebang detection Ian Kelling
2016-09-23 22:15           ` Jakub Narębski
2016-09-24 16:21             ` Jakub Narębski
2016-09-24 17:52               ` Junio C Hamano
2016-09-24 22:35               ` Ian Kelling
2016-09-24 22:34             ` Ian Kelling
2016-09-24 22:32           ` Ian Kelling [this message]
2016-09-24 22:32             ` [PATCH v4 " Ian Kelling
2016-09-25 18:04               ` Jakub Narębski
2016-09-28  7:37                 ` Ian Kelling
2016-09-25 17:57             ` [PATCH v4 1/2] gitweb: remove unused guess_file_syntax() parameter Jakub Narębski
2016-09-23 19:44         ` [PATCH v3 1/2] gitweb: remove unused function parameter Jakub Narębski
2016-09-23 19:57           ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160924223258.9449-1-ian@iankelling.org \
    --to=ian@iankelling.org \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).