diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-16 01:18:34 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-16 01:18:34 +0200 |
| commit | a6ddf469fadefcd61bf6bb079160d538f02ef427 (patch) | |
| tree | f4eabf724edce1f6d512b0f7cebb2747d9bf6a73 /lib/coderay/token_kinds.rb | |
| parent | e423275749744fb2cf768087a07b4c839eaf4734 (diff) | |
| parent | dc9528456008216c265cfb6613cfa459c3c9ffad (diff) | |
| download | coderay-a6ddf469fadefcd61bf6bb079160d538f02ef427.tar.gz | |
Merge branch 'master' into remove-dump
Conflicts:
lib/coderay/tokens.rb
Diffstat (limited to 'lib/coderay/token_kinds.rb')
| -rwxr-xr-x | lib/coderay/token_kinds.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb index 42ea427..9154658 100755 --- a/lib/coderay/token_kinds.rb +++ b/lib/coderay/token_kinds.rb @@ -44,7 +44,7 @@ module CodeRay :important => 'important', # CSS, Taskpaper :include => 'include', # C, Groovy, Java, Python, Sass :inline => 'inline', # nested code, eg. inline string evaluation; lots of scanners - :inline_delimiter => 'inline-delimiter', # used instead of :inline > :delimiter FIXME: Why? + :inline_delimiter => 'inline-delimiter', # used instead of :inline > :delimiter FIXME: Why use inline_delimiter? :instance_variable => 'instance-variable', # Ruby :integer => 'integer', # most scanners :key => 'key', # lots of scanners, used together with :value |