Merge branch 'master' into newlisp

This commit is contained in:
Paul Chaignon
2014-12-06 19:56:29 -05:00
5 changed files with 75 additions and 9 deletions

View File

@@ -155,6 +155,22 @@ module Linguist
Language["LiveScript"]
end
end
disambiguate "Common Lisp", "NewLisp" do |data|
if /^\s*\((defun|defactor|in-package|defpackage) /.match(data)
Language["Common Lisp"]
elsif /^\s*\(define /.match(data)
Language["NewLisp"]
end
end
disambiguate "TypeScript", "XML" do |data|
if data.include?("<TS ")
Language["XML"]
else
Language["TypeScript"]
end
end
disambiguate "Frege", "Forth", "text" do |data|
if /^(: |also |new-device|previous )/.match(data)
@@ -165,13 +181,5 @@ module Linguist
Language["text"]
end
end
disambiguate "Common Lisp", "NewLisp" do |data|
if /^\s*\((defun|defactor|in-package|defpackage) /.match(data)
Language["Common Lisp"]
elsif /^\s*\(define /.match(data)
Language["NewLisp"]
end
end
end
end