Merge branch 'master' into 2794-local

2026-01-07 18:05:33 +00:00 · 2016-01-07 16:28:54 -05:00
parent 5d4cad6394 89c5361f25
commit 65087dd7b8
38 changed files with 1152 additions and 37 deletions
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2108,6 +2108,7 @@ MediaWiki:
  wrap: true
  extensions:
  - .mediawiki
+  - .wiki
  tm_scope: text.html.mediawiki
  ace_mode: text

@@ -3355,6 +3356,14 @@ Squirrel:
  tm_scope: source.c++
  ace_mode: c_cpp

+Stan:
+  type: programming
+  color: "#b2011d"
+  extensions:
+  - .stan
+  ace_mode: text
+  tm_scope: source.stan
+
 Standard ML:
  type: programming
  color: "#dc566d"
@@ -3966,6 +3975,8 @@ reStructuredText:
  extensions:
  - .rst
  - .rest
+  - .rest.txt
+  - .rst.txt
  ace_mode: text

 wisp: