Merging github/master 0872058

lib/linguist/languages.yml

@@ -120,6 +120,11 @@ Brainfuck:
   - .b
   - .bf
 
+Bro:
+  type: programming
+  extensions:
+  - .bro
+
 C:
   type: programming
   overrides:
@@ -128,6 +133,7 @@ C:
   extensions:
   - .c
   - .h
+  - .w
 
 C#:
   type: programming
@@ -162,6 +168,15 @@ C-ObjDump:
   extensions:
   - .c-objdump
 
+C2hs Haskell:
+  type: programming
+  lexer: Haskell
+  group: Haskell
+  aliases:
+  - c2hs
+  extensions:
+  - .chs
+
 CMake:
   extensions:
   - .cmake
@@ -214,6 +229,12 @@ Common Lisp:
   - .lisp
   - .ny
 
+Coq:
+  type: programming
+  lexer: Coq
+  extensions:
+  - .v
+
 Cpp-ObjDump:
   type: data
   lexer: cpp-objdump
@@ -280,6 +301,13 @@ Eiffel:
   extensions:
   - .e
 
+Elixir:
+  type: programming
+  primary_extension: .ex
+  extensions:
+  - .ex
+  - .exs
+
 Emacs Lisp:
   type: programming
   lexer: Scheme
@@ -566,6 +594,12 @@ Literate Haskell:
   extensions:
   - .lhs
 
+Logtalk:
+  type: programming
+  primary_extension: .lgt
+  extensions:
+  - .lgt
+
 Lua:
   type: programming
   primary_extension: .lua
@@ -706,6 +740,19 @@ OpenCL:
   extensions:
   - .cl
 
+OpenEdge ABL:
+  type: programming
+  aliases:
+  - progress
+  - openedge
+  - abl
+  primary_extension: .p
+  overrides:
+  - .cls
+  extensions:
+  - .cls
+  - .p
+
 PHP:
   type: programming
   extensions:
@@ -757,6 +804,15 @@ Perl:
   - .psgi
   - .t
 
+Powershell:
+  type: programming
+  lexer: Text only
+  aliases:
+  - posh
+  extensions:
+  - .ps1
+  - .psm1
+
 Prolog:
   type: programming
   extensions:
@@ -920,6 +976,13 @@ Scheme:
   - .sps
   - .ss
 
+Scilab:
+  type: programming
+  primary_extension: .sci
+  extensions:
+  - .sce
+  - .tst
+
 Self:
   type: programming
   lexer: Text only
@@ -1050,6 +1113,8 @@ Vala:
 Verilog:
   type: programming
   lexer: verilog
+  overrides:
+  - .v
   extensions:
   - .v