diff options
| author | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2012-06-29 17:51:09 +0100 |
| commit | 0c06a181819249c6a4a2a6c60e13f739df1f2253 (patch) | |
| tree | 859377c572d0acbfc520b02304ef515bf3aebbe0 /inc/geshi/erlang.php | |
| parent | ef7e36e4fd2a168977754f0aac1d855fb651f104 (diff) | |
| parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
| download | rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.gz rpg-0c06a181819249c6a4a2a6c60e13f739df1f2253.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements
Conflicts:
lib/tpl/dokuwiki/css/basic.css
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..ede55917c 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.10 * 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' => '(?<=\'|)', |