Re-apply fix for Haskell syntax

See I210832c4.

Change-Id: I5e74332b22fe58a39f99c70adb429f795f18ae75
This commit is contained in:
Ori Livneh 2013-09-28 15:16:27 -07:00
parent 8ea05787d4
commit 4c92cbc430
2 changed files with 13 additions and 2 deletions

View file

@ -41,7 +41,7 @@
//
/** The version of this GeSHi file */
define('GESHI_VERSION', '1.0.8.12');
define('GESHI_VERSION', '1.0.8.12-wmf1'); // WMF fix for Haskell (bug 52509)
// Define the root directory for the GeSHi code tree
if (!defined('GESHI_ROOT')) {

View file

@ -11,6 +11,17 @@
*
* Haskell language file for GeSHi.
*
* CHANGES
* -------
* 2013/09/28
* - Single quotes dropped from QUOTEMARKS to resolve <https://bugzilla.wikimedia.org/52509>.
* Change is local to SyntaxHighlight_GeSHi, made by Ori Livneh (ori@wikimedia.org), based
* on a proposed upstream patch.
* Upstream bug report:
* <http://sourceforge.net/p/geshi/bugs/217/>
* Upstream patch (stalled since 2012):
* <http://sourceforge.net/p/geshi/bugs/219/>
*
*************************************************************************************
*
* This file is part of GeSHi.
@ -40,7 +51,7 @@ $language_data = array (
3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
),
'CASE_KEYWORDS' => 0,
'QUOTEMARKS' => array('"',"'"),
'QUOTEMARKS' => array('"'), // SyntaxHighlight_GeSHi modification; see CHANGES above.
'ESCAPE_CHAR' => '\\',
'KEYWORDS' => array(
/* main haskell keywords */