[PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug"

[PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug"

[mailings]

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 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 0acdf12..3fe7fa1 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -42,21 +42,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.7.6

[PATCH v1 1/1] Revert "filters/syntax-highlighting.sh: work around highlight --force bug"

[cgit]

On Thu, Apr 19, 2012 at 11:17:13PM +0200, Ferry Huberts wrote:
> 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.

Did you check other popular distributions as well?

> 
> Signed-off-by: Ferry Huberts <ferry.huberts at pelagic.nl>
> ---
>  filters/syntax-highlighting.sh |   17 -----------------
>  1 files changed, 0 insertions(+), 17 deletions(-)
> 
> diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
> index 0acdf12..3fe7fa1 100755
> --- a/filters/syntax-highlighting.sh
> +++ b/filters/syntax-highlighting.sh
> @@ -42,21 +42,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.7.6
> 
> 
> _______________________________________________
> cgit mailing list
> cgit at hjemli.net
> http://hjemli.net/mailman/listinfo/cgit