diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 13:29:01 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 13:29:01 +0200 |
| commit | 1d445c70edf8d5c878f9a830dcd29f5a3e179923 (patch) | |
| tree | 75ad0b7db37981acd3bf54984353e70229e351ad /lib/coderay/scanners/diff.rb | |
| parent | d9d6dd5f4a73363ea5d353ecda142f77ed4eba5a (diff) | |
| parent | 1e330f16c21c45eff375ba3b12f966c76ba0b393 (diff) | |
| download | coderay-1d445c70edf8d5c878f9a830dcd29f5a3e179923.tar.gz | |
Merge branch 'master' into upstream
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 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) |