diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 14:36:53 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 14:36:53 +0200 |
commit | 8c3c0c49a98eb8daceb69d0b233d054fbbccc49e (patch) | |
tree | 52dfc1b4abe110580a51ec0c0d056d1044c44151 /lib/coderay/scanners/diff.rb | |
parent | 7ada74c8f0f77815393e887db83e1d2c36ce7235 (diff) | |
parent | 9651f0b464b6540a1427ea8320abaa01caf197b3 (diff) | |
download | coderay-8c3c0c49a98eb8daceb69d0b233d054fbbccc49e.tar.gz |
Merge branch 'master' into css-in-html
Diffstat (limited to 'lib/coderay/scanners/diff.rb')
-rw-r--r-- | lib/coderay/scanners/diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb index af0f755..fd1aed6 100644 --- a/lib/coderay/scanners/diff.rb +++ b/lib/coderay/scanners/diff.rb @@ -69,7 +69,7 @@ module Scanners state = :added elsif match = scan(/\\ .*/) encoder.text_token match, :comment - elsif match = scan(/@@(?>[^@\n]*)@@/) + elsif match = scan(/@@(?>[^@\n]+)@@/) content_scanner.state = :initial unless match?(/\n\+/) content_scanner_entry_state = nil if check(/\n|$/) |