Merge branch 'master' into 3233-local

lib/linguist/languages.yml

@@ -227,7 +227,6 @@ Apex:
   language_id: 17
 Apollo Guidance Computer:
   type: programming
-  color: "#0B3D91"
   group: Assembly
   extensions:
   - ".agc"
@@ -369,7 +368,6 @@ Bison:
   extensions:
   - ".bison"
   ace_mode: text
-  color: "#6A463F"
   language_id: 31
 BitBake:
   type: programming
@@ -563,6 +561,17 @@ COLLADA:
   codemirror_mode: xml
   codemirror_mime_type: text/xml
   language_id: 49
+CSON:
+  type: data
+  group: CoffeeScript
+  tm_scope: source.coffee
+  ace_mode: coffee
+  codemirror_mode: coffeescript
+  codemirror_mime_type: text/x-coffeescript
+  searchable: false
+  extensions:
+  - ".cson"
+  language_id: 424
 CSS:
   type: markup
   tm_scope: source.css
@@ -693,7 +702,6 @@ CoffeeScript:
   - "._coffee"
   - ".cake"
   - ".cjsx"
-  - ".cson"
   - ".iced"
   filenames:
   - Cakefile
@@ -702,7 +710,6 @@ CoffeeScript:
   language_id: 63
 ColdFusion:
   type: programming
-  group: ColdFusion
   ace_mode: coldfusion
   color: "#ed2cd6"
   search_term: cfm
@@ -719,7 +726,6 @@ ColdFusion CFC:
   type: programming
   group: ColdFusion
   ace_mode: coldfusion
-  color: "#ed2cd6"
   search_term: cfc
   aliases:
   - cfc
@@ -1037,7 +1043,6 @@ ECLiPSe:
   language_id: 94
 EJS:
   type: markup
-  color: "#a91e50"
   group: HTML
   extensions:
   - ".ejs"
@@ -1725,11 +1730,9 @@ Haml:
   ace_mode: haml
   codemirror_mode: haml
   codemirror_mime_type: text/x-haml
-  color: "#ECE2A9"
   language_id: 154
 Handlebars:
   type: markup
-  color: "#01a9d6"
   group: HTML
   aliases:
   - hbs
@@ -1834,6 +1837,8 @@ IRC log:
   - ".weechatlog"
   tm_scope: none
   ace_mode: text
+  codemirror_mode: mirc
+  codemirror_mime_type: text/mirc
   language_id: 164
 Idris:
   type: programming
@@ -1908,7 +1913,6 @@ J:
   language_id: 172
 JFlex:
   type: programming
-  color: "#DBCA00"
   group: Lex
   extensions:
   - ".flex"
@@ -2040,19 +2044,6 @@ JavaScript:
   - ".pac"
   - ".sjs"
   - ".ssjs"
-  - ".sublime-build"
-  - ".sublime-commands"
-  - ".sublime-completions"
-  - ".sublime-keymap"
-  - ".sublime-macro"
-  - ".sublime-menu"
-  - ".sublime-mousemap"
-  - ".sublime-project"
-  - ".sublime-settings"
-  - ".sublime-theme"
-  - ".sublime-workspace"
-  - ".sublime_metrics"
-  - ".sublime_session"
   - ".xsjs"
   - ".xsjslib"
   filenames:
@@ -2064,6 +2055,8 @@ Julia:
   type: programming
   extensions:
   - ".jl"
+  interpreters:
+  - julia
   color: "#a270ba"
   ace_mode: julia
   codemirror_mode: julia
@@ -2125,7 +2118,6 @@ LFE:
   type: programming
   extensions:
   - ".lfe"
-  color: "#004200"
   group: Erlang
   tm_scope: source.lisp
   ace_mode: lisp
@@ -2182,7 +2174,6 @@ Lasso:
   language_id: 195
 Latte:
   type: markup
-  color: "#A8FF97"
   group: HTML
   extensions:
   - ".latte"
@@ -2207,7 +2198,6 @@ Less:
   ace_mode: less
   codemirror_mode: css
   codemirror_mime_type: text/css
-  color: "#A1D9A1"
   language_id: 198
 Lex:
   type: programming
@@ -2405,7 +2395,7 @@ MQL4:
   - ".mqh"
   tm_scope: source.mql5
   ace_mode: c_cpp
-  language_id: 422
+  language_id: 426
 MQL5:
   type: programming
   color: "#4A76B8"
@@ -2414,7 +2404,7 @@ MQL5:
   - ".mqh"
   tm_scope: source.mql5
   ace_mode: c_cpp
-  language_id: 423
+  language_id: 427
 MTML:
   type: markup
   color: "#b7e1f4"
@@ -2455,6 +2445,7 @@ Makefile:
   - Kbuild
   - Makefile
   - Makefile.am
+  - Makefile.boot
   - Makefile.frag
   - Makefile.in
   - Makefile.inc
@@ -2813,7 +2804,6 @@ NumPy:
   ace_mode: text
   codemirror_mode: python
   codemirror_mime_type: text/x-python
-  color: "#9C8AF9"
   language_id: 254
 OCaml:
   type: programming
@@ -3163,6 +3153,17 @@ Perl6:
   codemirror_mode: perl
   codemirror_mime_type: text/x-perl
   language_id: 283
+Pic:
+  type: markup
+  group: Groff
+  tm_scope: "source.pic"
+  extensions:
+  - ".pic"
+  - ".chem"
+  ace_mode: text
+  codemirror_mode: troff
+  codemirror_mime_type: text/troff
+  language_id: 425
 Pickle:
   type: data
   extensions:
@@ -3305,6 +3306,8 @@ Public Key:
   - ".pub"
   tm_scope: none
   ace_mode: text
+  codemirror_mode: asciiarmor
+  codemirror_mime_type: application/pgp
   language_id: 298
 Puppet:
   type: programming
@@ -3697,7 +3700,6 @@ SCSS:
   codemirror_mime_type: text/x-scss
   extensions:
   - ".scss"
-  color: "#CF649A"
   language_id: 329
 SMT:
   type: programming
@@ -3823,7 +3825,6 @@ Sass:
   ace_mode: sass
   codemirror_mode: sass
   codemirror_mime_type: text/x-sass
-  color: "#CF649A"
   language_id: 340
 Scala:
   type: programming
@@ -3950,7 +3951,6 @@ Slash:
 Slim:
   group: HTML
   type: markup
-  color: "#ff8f77"
   extensions:
   - ".slim"
   tm_scope: text.slim
@@ -4058,6 +4058,28 @@ SubRip Text:
   ace_mode: text
   tm_scope: text.srt
   language_id: 360
+Sublime Text Config:
+  type: data
+  group: JSON
+  tm_scope: source.js
+  ace_mode: javascript
+  codemirror_mode: javascript
+  codemirror_mime_type: text/javascript
+  extensions:
+  - ".sublime-build"
+  - ".sublime-commands"
+  - ".sublime-completions"
+  - ".sublime-keymap"
+  - ".sublime-macro"
+  - ".sublime-menu"
+  - ".sublime-mousemap"
+  - ".sublime-project"
+  - ".sublime-settings"
+  - ".sublime-theme"
+  - ".sublime-workspace"
+  - ".sublime_metrics"
+  - ".sublime_session"
+  language_id: 423
 SuperCollider:
   type: programming
   color: "#46390b"
@@ -4090,6 +4112,17 @@ SystemVerilog:
   codemirror_mode: verilog
   codemirror_mime_type: text/x-systemverilog
   language_id: 363
+TI Program:
+  type: programming
+  ace_mode: text
+  color: "#A0AA87"
+  extensions:
+  - ".8xp"
+  - ".8xk"
+  - ".8xk.txt"
+  - ".8xp.txt"
+  language_id: 422
+  tm_scope: none
 TLA:
   type: programming
   extensions:
@@ -4272,7 +4305,6 @@ Unified Parallel C:
   ace_mode: c_cpp
   codemirror_mode: clike
   codemirror_mime_type: text/x-csrc
-  color: "#4e3617"
   extensions:
   - ".upc"
   tm_scope: source.c

lib/linguist/vendor.yml

@@ -15,6 +15,9 @@
 # Dependencies
 - ^[Dd]ependencies/
 
+# Distributions
+- (^|/)dist/
+
 # C deps
 #  https://github.com/joyent/node
 - ^deps/