Merge branch 'master' into 985

Conflicts:
	lib/linguist/languages.yml

.travis.yml

@@ -2,11 +2,8 @@ before_install:
   - sudo apt-get install libicu-dev -y
   - gem update --system 2.1.11
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.1
-  - ree
 notifications:
   disabled: true

Gemfile

@@ -1,7 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-if RUBY_VERSION < "1.9.3"
-  # escape_utils 1.0.0 requires 1.9.3 and above
-  gem "escape_utils", "0.3.2"
-end

github-linguist.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables << 'linguist'
 
   s.add_dependency 'charlock_holmes', '~> 0.6.6'
-  s.add_dependency 'escape_utils',    '>= 0.3.1'
+  s.add_dependency 'escape_utils',    '~> 1.0.1'
   s.add_dependency 'mime-types',      '~> 1.19'
   s.add_dependency 'pygments.rb',     '~> 0.5.4'
 

lib/linguist/languages.yml

@@ -9,7 +9,7 @@
 #                     includes name.downcase)
 # ace_mode          - A String name of Ace Mode (if available)
 # wrap              - Boolean wrap to enable line wrapping (default: false)
-# extension         - An Array of associated extensions (the first one is
+# extensions        - An Array of associated extensions (the first one is
 #                     considered the primary extension)
 # interpreters      - An Array of associated interpreters
 # searchable        - Boolean flag to enable searching (defaults to true)
@@ -91,7 +91,8 @@ Alloy:
   type: programming  # 'modeling' would be more appropiate
   lexer: Text only
   color: "#cc5c24"
-  primary_extension: .als
+  extensions:
+  - .als
 
 ApacheConf:
   type: markup
@@ -144,7 +145,8 @@ AspectJ:
   type: programming
   lexer: AspectJ
   color: "#1957b0"
-  primary_extension: .aj
+  extensions:
+  - .aj
 
 Assembly:
   type: programming
@@ -167,7 +169,7 @@ AutoHotkey:
   color: "#6594b9"
   aliases:
   - ahk
-  extension:
+  extensions:
   - .ahk
 
 AutoIt:
@@ -490,13 +492,13 @@ DM:
   type: programming
   color: "#075ff1"
   lexer: C++
-  extension:
+  extensions:
   - .dm
   aliases:
   - byond
 
 DOT:
-  type: programming
+  type: data
   lexer: Text only
   extensions:
   - .dot
@@ -533,7 +535,8 @@ Dogescript:
   type: programming
   lexer: Text only
   color: "#cca760"
-  primary_extension: .djs
+  extensions:
+  - .djs
 
 Dylan:
   type: programming
@@ -547,7 +550,8 @@ E:
   type: programming
   color: "#ccce35"
   lexer: Text only
-  primary_extension: .E
+  extensions:
+  - .E
 
 Ecere Projects:
   type: data
@@ -568,8 +572,8 @@ Eagle:
   type: markup
   color: "#3994bc"
   lexer: XML
-  primary_extension: .sch
   extensions:
+  - .sch
   - .brd
 
 Eiffel:
@@ -690,17 +694,19 @@ Frege:
   type: programming
   color: "#00cafe"
   lexer: Haskell
-  primary_extension: .fr
+  extensions:
+  - .fr
 
 Game Maker Language:
   type: programming
+  color: "#8ad353"
   lexer: JavaScript
-  primary_extension: .gml
+  extensions:
+  - .gml
 
 GAP:
   type: programming
   lexer: Text only
-  primary_extension: .g
   extensions:
   - .g
   - .gap
@@ -765,8 +771,8 @@ Gnuplot:
   type: programming
   color: "#f0a9f0"
   lexer: Gnuplot
-  primary_extension: .gp
   extensions:
+  - .gp
   - .gnu
   - .gnuplot
   - .plot
@@ -790,7 +796,8 @@ Grammatical Framework:
   aliases:
   - gf
   wrap: false
-  primary_extension: .gf
+  extensions:
+  - .gf
   searchable: true
   color: "#ff0000"
 
@@ -927,7 +934,8 @@ INI:
   - .properties
 
 Inno Setup:
-  primary_extension: .iss
+  extensions:
+  - .iss
   lexer: Text only
 
 Idris:
@@ -941,8 +949,8 @@ Inform 7:
   type: programming
   lexer: Text only
   wrap: true
-  primary_extension: .ni
   extensions:
+  - .ni
   - .i7x
 
 Inno Setup:
@@ -1013,7 +1021,8 @@ JSONiq:
   type: programming
   ace_mode: jsoniq
   lexer: XQuery
-  primary_extension: .jq
+  extensions:
+  - .jq
 
 Jade:
   group: HTML
@@ -1080,7 +1089,8 @@ Kit:
   type: markup
   lexer: HTML
   ace_mode: html
-  primary_extension: .kit
+  extensions:
+  - .kit
 
 Kotlin:
   type: programming
@@ -1113,7 +1123,8 @@ Latte:
   color: "#A8FF97"
   group: HTML
   lexer: Smarty
-  primary_extension: .latte
+  extensions:
+  - .latte
 
 Less:
   type: markup
@@ -1131,7 +1142,8 @@ LilyPond:
 Liquid:
   type: markup
   lexer: Text only
-  primary_extension: .liquid
+  extensions:
+  - .liquid
 
 Literate Agda:
   type: programming
@@ -1207,7 +1219,8 @@ MTML:
   type: markup
   lexer: HTML
   color: "#0095d9"
-  primary_extension: .mtml
+  extensions:
+  - .mtml
 
 Makefile:
   aliases:
@@ -1249,7 +1262,8 @@ Mask:
 
 Mathematica:
   type: programming
-  primary_extension: .mathematica
+  extensions:
+  - .mathematica
   lexer: Text only
 
 Matlab:
@@ -1283,11 +1297,7 @@ MediaWiki:
 
 Mercury:
   type: programming
-  # This is the background colour on the web page.
   color: "#abcdef"
-  # The primary extension is .m, but lingist won't accept duplicates
-  primary_extension: .mercury
-  # Mercury's syntax is not prolog syntax, but they do share the lexer
   lexer: Prolog
   ace_mode: prolog
   extensions:
@@ -1477,7 +1487,7 @@ PAWN:
 PHP:
   type: programming
   ace_mode: php
-  color: "#6e03c1"
+  color: "#4F5D95"
   extensions:
   - .php
   - .aw
@@ -1633,7 +1643,8 @@ PureScript:
   type: programming
   color: "#bcdc53"
   lexer: Haskell
-  primary_extension: .purs
+  extensions:
+  - .purs
 
 Python:
   type: programming
@@ -1674,6 +1685,7 @@ R:
   lexer: S
   aliases:
   - R
+  - Rscript
   extensions:
   - .r
   - .R
@@ -1751,6 +1763,14 @@ Rebol:
   - .r3
   - .rebol
 
+Red:
+  type: programming
+  lexer: Text only
+  color: "#ee0000"
+  extensions:
+  - .red
+  - .reds
+
 Redcode:
   extensions:
   - .cw
@@ -1907,7 +1927,8 @@ Shell:
 ShellSession:
   type: programming
   lexer: Bash Session
-  primary_extension: .sh-session
+  extensions:
+  - .sh-session
 
 Shen:
   type: programming
@@ -1937,7 +1958,8 @@ SourcePawn:
   color: "#f69e1d"
   aliases:
   - sourcemod
-  primary_extension: .sp
+  extensions:
+  - .sp
 
 Squirrel:
   type: programming
@@ -1958,14 +1980,13 @@ Stata:
   type: programming
   lexer: Text only
   extensions:
-  - .ado
   - .do
+  - .ado
   - .doh
   - .ihlp
   - .mata
   - .matah
   - .sthlp
-  primary_extension: .do
 
 Stylus:
   type: markup
@@ -1985,8 +2006,8 @@ SystemVerilog:
   type: programming
   color: "#343761"
   lexer: systemverilog
-  primary_extension: .sv
   extensions:
+  - .sv
   - .svh
   - .vh
 
@@ -2266,7 +2287,8 @@ Zephir:
   type: programming
   lexer: PHP
   color: "#118f9e"
-  primary_extension: .zep
+  extensions:
+  - .zep
 
 eC:
   type: programming