From: Adam Tkac <atkac@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jakub Narebski <jnareb@gmail.com>,
git@vger.kernel.org, Jochen Schmitt <Jochen@herr-schmitt.de>
Subject: [PATCH] Don't pass "--xhtml" to hightlight in gitweb.perl script.
Date: Thu, 27 Jan 2011 13:51:51 +0100 [thread overview]
Message-ID: <20110127125151.GA19072@traged.englab.brq.redhat.com> (raw)
In-Reply-To: <20110127120323.GA3416@traged.englab.brq.redhat.com>
The "--xhtml" option is supported only in highlight < 3.0. There is no option
to enforce (X)HTML output format compatible with both highlight < 3.0 and
highlight >= 3.0. However default output format is HTML so we don't need to
explicitly specify it.
Signed-off-by: Adam Tkac <atkac@redhat.com>
---
gitweb/gitweb.perl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 1025c2f..0779f12 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3468,7 +3468,7 @@ sub run_highlighter {
close $fd;
open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
quote_command($highlight_bin).
- " --xhtml --fragment --syntax $syntax |"
+ " --fragment --syntax $syntax |"
or die_error(500, "Couldn't open file or run syntax highlighter");
return $fd;
}
--
1.7.3.5
prev parent reply other threads:[~2011-01-27 12:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-26 17:11 [PATCH] Pass "-O xhtml" param to highlight instead of "-xhtml" Adam Tkac
2011-01-26 21:34 ` Jakub Narebski
2011-01-26 21:43 ` Junio C Hamano
2011-01-27 12:03 ` Adam Tkac
2011-01-27 12:51 ` Adam Tkac [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110127125151.GA19072@traged.englab.brq.redhat.com \
--to=atkac@redhat.com \
--cc=Jochen@herr-schmitt.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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 NNTP newsgroup(s).