diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
| commit | 0013b649f714f23eef0859921fa7804ca7caef76 (patch) | |
| tree | 7c278ee7c420729b4738fe2a195e529ffd2bb6da /lib/coderay/scanners/diff.rb | |
| parent | addcbd446066d0da1627112814e3ce1b8d404da0 (diff) | |
| parent | 64ca2ae8ad5130bdcf652aa7aa08298de00f20f4 (diff) | |
| download | coderay-0013b649f714f23eef0859921fa7804ca7caef76.tar.gz | |
Merge branch 'master' into go-scanner
Conflicts:
lib/coderay/helpers/file_type.rb
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|$/) |