Merge branch 'master' into new-grammars

2025-12-08 04:18:48 +00:00 · 2015-02-09 23:19:37 +01:00
parent 4eb8903bed 72acbc567b
commit 665f9ee5b5
8 changed files with 14 additions and 5 deletions
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -92,7 +92,7 @@ module Linguist
    disambiguate "Perl", "Perl6", "Prolog" do |data|
      if data.include?("use v6")
        Language["Perl6"]
-      elsif data.include?("use strict")
+      elsif data.match(/use strict|use\s+v?5\./)
        Language["Perl"]
      elsif data.include?(":-")
        Language["Prolog"]
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1807,7 +1807,7 @@ MediaWiki:
  wrap: true
  extensions:
  - .mediawiki
-  tm_scope: none
+  tm_scope: text.html.mediawiki
  ace_mode: text

 Mercury: