Merge master

lib/linguist/languages.yml

@@ -341,6 +341,8 @@ C:
   color: "#555"
   extensions:
   - .c
+  - .C
+  - .H
   - .cats
   - .h
   - .idc
@@ -369,9 +371,6 @@ C++:
   - cpp
   extensions:
   - .cpp
-  - .C
-  - .CPP
-  - .H
   - .c++
   - .cc
   - .cxx
@@ -574,6 +573,12 @@ Component Pascal:
   - objectpascal
   ace_mode: pascal
 
+Cool:
+  type: programming
+  extensions:
+  - .cl
+  tm_scope: source.cool
+
 Coq:
   type: programming
   extensions:
@@ -1066,6 +1071,12 @@ Grace:
   tm_scope: none
   ace_mode: none
 
+Gradle:
+  type: data
+  extensions:
+  - .gradle
+  tm_scope: source.groovy.gradle
+
 Grammatical Framework:
   type: programming
   aliases:
@@ -1331,7 +1342,7 @@ Isabelle:
   color: "#fdcd00"
   extensions:
   - .thy
-  tm_scope: none
+  tm_scope: source.isabelle.theory
   ace_mode: none
 
 J:
@@ -1422,6 +1433,7 @@ JavaScript:
   - .bones
   - .es6
   - .frag
+  - .gs
   - .jake
   - .jsb
   - .jsfl
@@ -1754,6 +1766,8 @@ Mercury:
   type: programming
   color: "#abcdef"
   ace_mode: prolog
+  interpreters:
+  - mmi
   extensions:
   - .m
   - .moo
@@ -2024,6 +2038,13 @@ Oxygene:
   tm_scope: none
   ace_mode: none
 
+Oz:
+  type: programming
+  color: "#fcaf3e"
+  extensions:
+  - .oz
+  tm_scope: source.oz
+
 PAWN:
   type: programming
   color: "#dbb284"
@@ -2334,6 +2355,15 @@ R:
   - Rscript
   ace_mode: r
 
+RAML:
+  type: data
+  lexer: YAML
+  ace_mode: yaml
+  tm_scope: source.yaml
+  color: "#77d9fb"
+  extensions:
+    - .raml
+
 RDoc:
   type: prose
   ace_mode: rdoc
@@ -3000,6 +3030,7 @@ XML:
   - .jelly
   - .kml
   - .launch
+  - .mm
   - .mxml
   - .nproj
   - .nuspec