summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerry Huberts <ferry.huberts@pelagic.nl>2012-10-09 11:08:30 (GMT)
committerJason A. Donenfeld <Jason@zx2c4.com>2012-10-09 11:12:09 (GMT)
commit2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78 (patch)
treee8aa0e248bac6376c5c800f35eec549c83acb6d7
parent6419c9b57c33a8a26d2775f01629f899afb61026 (diff)
downloadcgit-2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78.zip
cgit-2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78.tar.gz
cgit-2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78.tar.bz2
Revert "filters/syntax-highlighting.sh: work around highlight --force bug"
This reverts commit f50be7fda0a7ab57009169dd5905fcbab8eb5166. An update with the latest highlight landed in EPEL. This new version doesn't have the --force bug, so the workaround can now be removed. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
-rwxr-xr-xfilters/syntax-highlighting.sh17
1 files changed, 0 insertions, 17 deletions
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 5fcc9c9..0639b10 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -53,21 +53,4 @@ EXTENSION="${BASENAME##*.}"
exec highlight --force -f -I -X -S $EXTENSION 2>/dev/null
# This is for version 3
-#
-# On CentOS 6.2 (using highlight from EPEL), when highlight doesn't know about
-# an EXTENSION, it outputs a lua error and _no_ text, even when the --force
-# option is used.
-#
-# Also see the bug reports at:
-# http://sourceforge.net/tracker/?func=detail&aid=3490017&group_id=215618&atid=1034391
-# https://bugzilla.redhat.com/show_bug.cgi?id=795567
-#
-# This workaround can be removed when the bug is fixed upstream and the new
-# version is packaged in most distributions.
-#
-# The workaround is to set the extension to 'txt' (plain text) when highlight
-# exits with an error (doesn't know the format).
-#
-#echo "test" | highlight -f -I -O xhtml -S $EXTENSION &>/dev/null
-#[ ${?} -ne 0 ] && EXTENSION="txt"
#exec highlight --force -f -I -O xhtml -S $EXTENSION 2>/dev/null