Merge pull request #1354 from github/binary-language-mkII

Ask Charlock earlier

lib/linguist/language.rb

@@ -104,7 +104,7 @@ def self.detect(blob)
       #
       # We'll perform a more comprehensive test later which actually involves
       # looking for binary characters in the blob
-      return nil if blob.likely_binary?
+      return nil if blob.likely_binary? || blob.binary?
 
       # A bit of an elegant hack. If the file is executable but extensionless,
       # append a "magic" extension so it can be classified with other
@@ -124,7 +124,7 @@ def self.detect(blob)
         possible_language_names = possible_languages.map(&:name)
 
         # Don't bother with binary contents or an empty file
-        if blob.binary? || data.nil? || data == ""
+        if data.nil? || data == ""
           nil
         # Check if there's a shebang line and use that as authoritative
         elsif (result = find_by_shebang(data)) && !result.empty?
@@ -401,7 +401,7 @@ def initialize(attributes = {})
     #
     # Returns the extensions Array
     attr_reader :filenames
-    
+
     # Public: Return all possible extensions for language
     def all_extensions
       (extensions + [primary_extension]).uniq