minor fix in diff scanner, .tmproj filetype: 1.0.3

korny · korny · commit ff966c007940 · 2011-10-26T13:38:19.000+02:00
diff --git a/Changes.textile b/Changes.textile
@@ -4,6 +4,16 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
  
 {{toc}}
  
+h2. Changes in 1.0.3
+ 
+New:
+ 
+* .tmproj files are recognized as XML.
+ 
+Fixes:
+ 
+* Removed files are highlighted inside diffs generated by git.
+
 h2. Changes in 1.0.2
  
 Fixes:
diff --git a/lib/coderay/helpers/file_type.rb b/lib/coderay/helpers/file_type.rb
@@ -119,6 +119,7 @@ def shebang filename
       # 'sch'      => :scheme,
       'sql'      => :sql,
       # 'ss'       => :scheme,
+      'tmproj'   => :xml,
       'xhtml'    => :page,
       'xml'      => :xml,
       'yaml'     => :yaml,
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
@@ -49,7 +49,7 @@ def scan_tokens encoder, options
             encoder.text_token match, :head
             if match = scan(/.*?(?=$|[\t\n\x00]|  \(revision)/)
               encoder.text_token match, :filename
-              if options[:highlight_code]
+              if options[:highlight_code] && match != '/dev/null'
                 file_type = FileType.fetch(match, :text)
                 file_type = :text if file_type == :diff
                 content_scanner = scanners[file_type]
diff --git a/lib/coderay/version.rb b/lib/coderay/version.rb
@@ -1,3 +1,3 @@
 module CodeRay
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end
