List for cgit developers and users
 help / color / mirror / Atom feed
* [RESEND] [PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug"
@ 2012-10-09 11:08 mailings
  2012-10-09 11:13 ` Jason
  0 siblings, 1 reply; 2+ messages in thread
From: mailings @ 2012-10-09 11:08 UTC (permalink / raw)


From: Ferry Huberts <ferry.huberts at pelagic.nl>

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 at pelagic.nl>
---
 filters/syntax-highlighting.sh | 17 -----------------
 1 file changed, 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
-- 
1.7.11.4





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [RESEND] [PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug"
  2012-10-09 11:08 [RESEND] [PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug" mailings
@ 2012-10-09 11:13 ` Jason
  0 siblings, 0 replies; 2+ messages in thread
From: Jason @ 2012-10-09 11:13 UTC (permalink / raw)


http://git.zx2c4.com/cgit/commit/?id=2ad9063cb53b55b1456c7d2ed08e6fb99d32ab78

Applied, thanks.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-09 11:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-09 11:08 [RESEND] [PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug" mailings
2012-10-09 11:13 ` Jason

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).