Merge branch 'master' into specfiles

lib/linguist/heuristics.rb

@@ -354,7 +354,7 @@ module Linguist
     disambiguate ".r" do |data|
       if /\bRebol\b/i.match(data)
         Language["Rebol"]
-      elsif data.include?("<-")
+      elsif /<-|^\s*#/.match(data)
         Language["R"]
       end
     end

lib/linguist/languages.yml

@@ -12,7 +12,7 @@
 #                     listed alphabetically)
 # interpreters      - An Array of associated interpreters
 # searchable        - Boolean flag to enable searching (defaults to true)
-# search_term       - Deprecated: Some languages maybe indexed under a
+# search_term       - Deprecated: Some languages may be indexed under a
 #                     different alias. Avoid defining new exceptions.
 # color             - CSS hex color to represent the language.
 # tm_scope          - The TextMate scope that represents this programming
@@ -23,9 +23,9 @@
 #                     in the statistics as the parent language.
 #
 # Any additions or modifications (even trivial) should have corresponding
-# test change in `test/test_blob.rb`.
+# test changes in `test/test_blob.rb`.
 #
-# Please keep this list alphabetized. Capitalization comes before lower case.
+# Please keep this list alphabetized. Capitalization comes before lowercase.
 
 1C Enterprise:
   type: programming
@@ -1027,7 +1027,7 @@ Elm:
 
 Emacs Lisp:
   type: programming
-  tm_scope: source.lisp
+  tm_scope: source.emacs.lisp
   color: "#c065db"
   aliases:
   - elisp
@@ -1035,6 +1035,7 @@ Emacs Lisp:
   filenames:
   - .emacs
   - .emacs.desktop
+  - .spacemacs
   extensions:
   - .el
   - .emacs
@@ -4148,6 +4149,7 @@ XML:
   - .rdf
   - .resx
   - .rss
+  - .sch
   - .scxml
   - .sfproj
   - .srdf