Merge branch 'master' into prolog-grammar

2025-10-29 17:50:22 +00:00 · 2015-08-19 20:46:15 +02:00
parent 0d7a264981 52ff2d2e74
commit 0c5aa2a7eb
20 changed files with 135 additions and 16 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -214,7 +214,7 @@ AspectJ:
  color: "#a957b0"
  extensions:
  - .aj
-  tm_scope: none
+  tm_scope: source.aspectj
  ace_mode: text

 Assembly:
@@ -616,6 +616,7 @@ Common Lisp:
  - .lsp
  - .ny
  - .podsl
+  - .sexp
  interpreters:
  - lisp
  - sbcl
@@ -1718,8 +1719,8 @@ LabVIEW:
  type: programming
  extensions:
  - .lvproj
-  tm_scope: none
-  ace_mode: text
+  tm_scope: text.xml
+  ace_mode: xml

 Lasso:
  type: programming
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.5.13"
+  VERSION = "4.5.14"
 end