Merge branch 'master' into cpp-c-improvements

This commit is contained in:
Arfon Smith
2014-12-12 08:21:32 -06:00
37 changed files with 257 additions and 960 deletions

View File

@@ -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