Merge branch 'master' into isabelle-grammar

Conflicts:
	grammars.yml

lib/linguist/heuristics.rb

@@ -94,9 +94,11 @@ module Linguist
       end
     end
 
-    disambiguate "Common Lisp", "OpenCL" do |data|
+    disambiguate "Common Lisp", "OpenCL", "Cool" do |data|
       if data.include?("(defun ")
         Language["Common Lisp"]
+      elsif /^class/x.match(data)
+        Language["Cool"]
       elsif /\/\* |\/\/ |^\}/.match(data)
         Language["OpenCL"]
       end
@@ -139,5 +141,9 @@ module Linguist
         Language["GLSL"]
       end
     end
+
+    disambiguate "Gosu", "JavaScript" do |data|
+      Language["Gosu"] if /^uses java\./.match(data)
+    end    
   end
 end

lib/linguist/languages.yml

@@ -527,6 +527,12 @@ Component Pascal:
   - delphi
   - objectpascal
 
+Cool:
+  type: programming
+  extensions:
+  - .cl
+  tm_scope: source.cool
+
 Coq:
   type: programming
   extensions:
@@ -968,6 +974,12 @@ Grace:
   - .grace
   tm_scope: none
 
+Gradle:
+  type: data
+  extensions:
+  - .gradle
+  tm_scope: source.groovy.gradle
+
 Grammatical Framework:
   type: programming
   aliases:
@@ -1297,6 +1309,7 @@ JavaScript:
   - .bones
   - .es6
   - .frag
+  - .gs
   - .jake
   - .jsb
   - .jsfl
@@ -1603,6 +1616,8 @@ Mercury:
   type: programming
   color: "#abcdef"
   ace_mode: prolog
+  interpreters:
+  - mmi
   extensions:
   - .m
   - .moo
@@ -1842,6 +1857,13 @@ Oxygene:
   extensions:
   - .oxygene
   tm_scope: none
+  
+Oz:
+  type: programming
+  color: "#fcaf3e"
+  extensions:
+  - .oz
+  tm_scope: source.oz
 
 PAWN:
   type: programming
@@ -2130,6 +2152,15 @@ R:
   interpreters:
   - Rscript
 
+RAML:
+  type: data
+  lexer: YAML
+  ace_mode: yaml
+  tm_scope: source.yaml
+  color: "#77d9fb"
+  extensions:
+    - .raml
+
 RDoc:
   type: prose
   ace_mode: rdoc

lib/linguist/vendor.yml

@@ -232,9 +232,6 @@
 # .DS_Store's
 - .[Dd][Ss]_[Ss]tore$
 
-# Mercury --use-subdirs
-- Mercury/
-
 # R packages
 - ^vignettes/
 - ^inst/extdata/