diff options
| author | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2012-09-10 17:04:45 +0200 |
| commit | 0f8ac4e8c5872a6b68b350f96a9ecde0291edefa (patch) | |
| tree | ad7938bb4143d5e5a38fd7a8d131e4171aec657d /inc/geshi/erlang.php | |
| parent | 58ec8fa9128e4581749955de87530f432e387588 (diff) | |
| parent | b31fcef02fd24b3e746c9618e77152c7b84c2f2a (diff) | |
| download | rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.gz rpg-0f8ac4e8c5872a6b68b350f96a9ecde0291edefa.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/geshi/erlang.php')
| -rw-r--r-- | inc/geshi/erlang.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/geshi/erlang.php b/inc/geshi/erlang.php index d98de2f37..4b8d406b0 100644 --- a/inc/geshi/erlang.php +++ b/inc/geshi/erlang.php @@ -7,7 +7,7 @@ * - Uwe Dauernheim (uwe@dauernheim.net) * - Dan Forest-Barbier (dan@twisted.in) * Copyright: (c) 2008 Uwe Dauernheim (http://www.kreisquadratur.de/) - * Release Version: 1.0.8.8 + * Release Version: 1.0.8.11 * Date Started: 2008-09-27 * * Erlang language file for GeSHi. @@ -355,7 +355,7 @@ $language_data = array( 2 => ':' ), 'REGEXPS' => array( - // Macro definitions + //�Macro definitions 0 => array( GESHI_SEARCH => '(-define\s*\()([a-zA-Z0-9_]+)(\(|,)', GESHI_REPLACE => '\2', @@ -403,7 +403,7 @@ $language_data = array( GESHI_BEFORE => '\1', GESHI_AFTER => '' ), - // ASCII codes + // ASCII�codes 6 => '(\$[a-zA-Z0-9_])', // Records 7 => array( @@ -423,8 +423,8 @@ $language_data = array( 'PARSER_CONTROL' => array( 'KEYWORDS' => array( 3 => array( - 'DISALLOWED_BEFORE' => '', - 'DISALLOWED_AFTER' => '(?=\s*\()' + 'DISALLOWED_BEFORE' => '(?<![\w])', + 'DISALLOWED_AFTER' => ''//'(?=\s*\()' ), 5 => array( 'DISALLOWED_BEFORE' => '(?<=\'|)', |