diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-12 16:04:45 +0200 |
commit | 69246fc8ed0344eae4dab35286813a00010a08cb (patch) | |
tree | 9c4faf0bcc2bb53e7955aff0b139492ea04dbe2e /lib/coderay/scanners/python.rb | |
parent | 34e823d709ce19a480dbd78e72e63ada0d3425fb (diff) | |
parent | 40bd2ef5d33d32c3b3987da1d115b717259819e4 (diff) | |
download | coderay-69246fc8ed0344eae4dab35286813a00010a08cb.tar.gz |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/token_kinds.rb
Diffstat (limited to 'lib/coderay/scanners/python.rb')
-rw-r--r-- | lib/coderay/scanners/python.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/python.rb b/lib/coderay/scanners/python.rb index cbdbbdb..a9492ab 100644 --- a/lib/coderay/scanners/python.rb +++ b/lib/coderay/scanners/python.rb @@ -133,7 +133,7 @@ module Scanners elsif match = scan(/ \\ | $ /x) encoder.end_group string_type string_type = nil - encoder.text_token match, :error + encoder.text_token match, :error unless match.empty? state = :initial else raise_inspect "else case \" reached; %p not handled." % peek(1), encoder, state |