Merge branch 'master' into apollo

This commit is contained in:
Arfon Smith
2016-07-13 10:35:02 -06:00
3 changed files with 6680 additions and 0 deletions

View File

@@ -239,6 +239,14 @@ module Linguist
end
end
disambiguate ".md" do |data|
if /^[-a-z0-9=#!\*\[|]/i.match(data)
Language["Markdown"]
elsif /^(;;|\(define_)/.match(data)
Language["GCC machine description"]
end
end
disambiguate ".ml" do |data|
if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
Language["OCaml"]

View File

@@ -1200,6 +1200,13 @@ GAS:
tm_scope: source.assembly
ace_mode: assembly_x86
GCC Machine Description:
type: programming
extensions:
- .md
tm_scope: source.lisp
ace_mode: lisp
GDScript:
type: programming
extensions:

File diff suppressed because it is too large Load Diff