diff options
author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-07-14 02:49:16 +0200 |
---|---|---|
committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-07-14 02:49:16 +0200 |
commit | bf395bd14ed7f63aab84955f6768f59965e3a73e (patch) | |
tree | 870e3ee4980401f43c2dc9a34d2e8343ef3a20ca /lib/coderay/scanners/diff.rb | |
parent | ffe0c90999c0b7255a5dfc608c84e683440475b1 (diff) | |
parent | 7493dcbfded42686169027a158c18c5312a3af24 (diff) | |
download | coderay-bf395bd14ed7f63aab84955f6768f59965e3a73e.tar.gz |
Merge branch 'master' into cleanup-output
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|$/) |