Merge branch 'master' into ft

diff --cc runtime/plugins/ftoptions/ftoptions.lua
index 0ac2060ea1679cbc0dabc8b04acb9b19ca90251c,a0170b942f3cee844f73d4224d34e6234155ce81..1ffe99cb8179857a698c85529463697e006c8fc7
--- 1/runtime/plugins/ftoptions/ftoptions.lua
--- 2/runtime/plugins/ftoptions/ftoptions.lua
+++ b/runtime/plugins/ftoptions/ftoptions.lua
@@@ -9,14 -9,9 +9,15 @@@ function onViewOpen(view
  
      local ft = view.Buf.Settings["filetype"]
  
 -    if ft == "makefile" or ft == "go" then
 +    if ft == "go" or
 +    ft == "makefile" then
          SetOption("tabstospaces", "off")
 -    elseif ft == "python" or ft == "python2" or ft == "python3" or ft == "yaml" or ft =="nim" then
 +    elseif ft == "fish" or
-     ft == "python" or
-     ft == "python2" or
-     ft == "python3" or
-     ft == "yaml" or
++           ft == "python" or
++           ft == "python2" or
++           ft == "python3" or
++           ft == "yaml" or
++           ft == "nim" then
          SetOption("tabstospaces", "on")
      end
  end