Merge branch 'master' into revert-2014-revert-1976-path-for-fileblob

.gitmodules

@@ -397,9 +397,6 @@
 [submodule "vendor/grammars/pascal.tmbundle"]
 	path = vendor/grammars/pascal.tmbundle
 	url = https://github.com/textmate/pascal.tmbundle
-[submodule "vendor/grammars/perl.tmbundle"]
-	path = vendor/grammars/perl.tmbundle
-	url = https://github.com/textmate/perl.tmbundle
 [submodule "vendor/grammars/php-smarty.tmbundle"]
 	path = vendor/grammars/php-smarty.tmbundle
 	url = https://github.com/textmate/php-smarty.tmbundle
@@ -645,3 +642,6 @@
 [submodule "vendor/grammars/xc.tmbundle"]
 	path = vendor/grammars/xc.tmbundle
 	url = https://github.com/graymalkin/xc.tmbundle
+[submodule "vendor/grammars/perl.tmbundle"]
+	path = vendor/grammars/perl.tmbundle
+	url = https://github.com/textmate/perl.tmbundle

grammars.yml

@@ -393,8 +393,9 @@ vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
 - source.oz
 vendor/grammars/pascal.tmbundle:
 - source.pascal
-vendor/grammars/perl.tmbundle:
+vendor/grammars/perl.tmbundle/:
 - source.perl
+- source.perl.6
 vendor/grammars/php-smarty.tmbundle:
 - source.smarty
 vendor/grammars/php.tmbundle:

lib/linguist/languages.yml

@@ -18,6 +18,8 @@
 #                     language. This should match one of the scopes listed in
 #                     the grammars.yml file. Use "none" if there is no grammar
 #                     for this language.
+# group             - Name of the parent language. Languages in a group are counted
+#                     in the statistics as the parent language.
 #
 # Any additions or modifications (even trivial) should have corresponding
 # test change in `test/test_blob.rb`.
@@ -2282,6 +2284,7 @@ Pascal:
 
 Perl:
   type: programming
+  tm_scope: source.perl
   ace_mode: perl
   color: "#0298c3"
   extensions:
@@ -2317,7 +2320,7 @@ Perl6:
   - Rexfile
   interpreters:
   - perl6
-  tm_scope: none
+  tm_scope: source.perl.6
   ace_mode: perl
 
 PigLatin: