Merge branch 'master' into cpp-c-improvements

lib/linguist/heuristics.rb

@@ -172,13 +172,13 @@ module Linguist
       end
     end
 
-    disambiguate "Frege", "Forth", "text" do |data|
+    disambiguate "Frege", "Forth", "Text" do |data|
       if /^(: |also |new-device|previous )/.match(data)
         Language["Forth"]
       elsif /\s*(import|module|package|data|type) /.match(data)
         Language["Frege"]
       else
-        Language["text"]
+        Language["Text"]
       end
     end
   end

lib/linguist/languages.yml

@@ -2888,6 +2888,15 @@ Tea:
   tm_scope: source.tea
   ace_mode: text
 
+Text:
+  type: prose
+  wrap: true
+  extensions:
+  - .txt
+  - .fr
+  tm_scope: none
+  ace_mode: text
+
 Textile:
   type: prose
   ace_mode: textile
@@ -3256,15 +3265,6 @@ reStructuredText:
   - .rest
   ace_mode: text
 
-text:
-  type: prose
-  wrap: true
-  extensions:
-  - .txt
-  - .fr
-  tm_scope: none
-  ace_mode: text
-
 wisp:
   type: programming
   ace_mode: clojure

lib/linguist/samples.rb

@@ -34,10 +34,6 @@ module Linguist
       Dir.entries(ROOT).sort!.each do |category|
         next if category == '.' || category == '..'
 
-        # Skip text and binary for now
-        # Possibly reconsider this later
-        next if category == 'Text' || category == 'Binary'
-
         dirname = File.join(ROOT, category)
         Dir.entries(dirname).each do |filename|
           next if filename == '.' || filename == '..'