diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-10 23:50:03 +0200 |
commit | 4540eb3ceb8882e28908073b20657b239ff2f878 (patch) | |
tree | 4d5d4f3a0f3929dfb8df7d3f2a318b1cac066a85 /lib/coderay/scanners/cpp.rb | |
parent | 8ad02d8bde0515636a63247a74098b4d819b7950 (diff) | |
parent | a69d5d43b79a4f2cf5aaccc50b2275bf0dab4aba (diff) | |
download | coderay-4540eb3ceb8882e28908073b20657b239ff2f878.tar.gz |
Merge branch 'master' into javascript-keep-state
Diffstat (limited to 'lib/coderay/scanners/cpp.rb')
-rw-r--r-- | lib/coderay/scanners/cpp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/cpp.rb b/lib/coderay/scanners/cpp.rb index 9da62f4..e61f56f 100644 --- a/lib/coderay/scanners/cpp.rb +++ b/lib/coderay/scanners/cpp.rb @@ -160,7 +160,7 @@ module Scanners encoder.text_token match, :char elsif match = scan(/ \\ | $ /x) encoder.end_group :string - encoder.text_token match, :error + encoder.text_token match, :error unless match.empty? state = :initial label_expected = false else |