Merge branch 'master' into modelines

lib/linguist/heuristics.rb

@@ -144,10 +144,22 @@ module Linguist
       end
     end
 
-    disambiguate ".for", ".f" do |data|
+    fortran_rx = /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i
+
+    disambiguate ".f" do |data|
       if /^: /.match(data)
         Language["Forth"]
-      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
+      elsif data.include?("flowop")
+        Language["Filebench WML"]
+      elsif fortran_rx.match(data)
+        Language["FORTRAN"]
+      end
+    end
+
+    disambiguate ".for" do |data|
+      if /^: /.match(data)
+        Language["Forth"]
+      elsif fortran_rx.match(data)
         Language["FORTRAN"]
       end
     end

lib/linguist/languages.yml

@@ -331,7 +331,7 @@ Batchfile:
   extensions:
   - .bat
   - .cmd
-  tm_scope: source.dosbatch
+  tm_scope: source.batchfile
   ace_mode: batchfile
   color: "#C1F12E"
 
@@ -1135,6 +1135,13 @@ Fantom:
   tm_scope: none
   ace_mode: text
 
+Filebench WML:
+  type: programming
+  extensions:
+  - .f
+  tm_scope: none
+  ace_mode: text
+
 Filterscript:
   type: programming
   group: RenderScript
@@ -3078,6 +3085,7 @@ Python:
   - .pyt
   - .pyw
   - .rpy
+  - .spec
   - .tac
   - .wsgi
   - .xpy
@@ -3196,6 +3204,15 @@ RMarkdown:
   - .rmd
   tm_scope: source.gfm
 
+RPM Spec:
+  type: data
+  tm_scope: source.rpm-spec
+  extensions:
+  - .spec
+  aliases:
+  - specfile
+  ace_mode: text
+
 RUNOFF:
   type: markup
   color: "#665a4e"
@@ -3331,6 +3348,7 @@ Ruby:
   - .rbx
   - .ru
   - .ruby
+  - .spec
   - .thor
   - .watchr
   interpreters:

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.8.9"
+  VERSION = "4.8.10"
 end