diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-09 07:27:56 +0200 |
| commit | 444054629e31bd69ee697586348572998e93bdab (patch) | |
| tree | 2a1753f85d5c14f72eaf701628e5e50b42cab328 /lib/coderay/scanners | |
| parent | 0e4858322bfc969bde1b02cab3113940654acf31 (diff) | |
| parent | 737fb3608c92506a573a79f611b94ff5d5da18e6 (diff) | |
| download | coderay-444054629e31bd69ee697586348572998e93bdab.tar.gz | |
Merge branch 'master' into sass-scanner
Conflicts:
lib/coderay/scanners/css.rb
Diffstat (limited to 'lib/coderay/scanners')
| -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 38efaf4..af0f755 100644 --- a/lib/coderay/scanners/diff.rb +++ b/lib/coderay/scanners/diff.rb @@ -45,7 +45,7 @@ module Scanners if match = scan(/--- |\+\+\+ |=+|_+/) encoder.begin_line line_kind = :head encoder.text_token match, :head - if match = scan(/.*?(?=$|[\t\n\x00]| \(revision)/) + if match = scan(/[^\x00\n]+?(?=$|[\t\n]| \(revision)/) encoder.text_token match, :filename if options[:highlight_code] && match != '/dev/null' file_type = CodeRay::FileType.fetch(match, :text) |