Merge branch 'multi_ft' into dev

This allows setting multiple filetypes at the same time e.g. 'vimwiki.md' Closes #817, resolves #830, resolves #461.
2020-04-03 13:31:36 -06:00
parent ca28174dcc 1e74443b5a
commit 78a41b79c6
6 changed files with 48 additions and 9 deletions
@@ -671,7 +671,7 @@ endfunction


 function! vimwiki#tbl#format(lnum, ...) abort
-  if !(&filetype ==? 'vimwiki')
+  if !vimwiki#u#ft_is_vw()
    return
  endif
  let line = getline(a:lnum)
@@ -754,7 +754,7 @@ endfunction


 function! vimwiki#tbl#reset_tw(lnum) abort
-  if !(&filetype ==? 'vimwiki')
+  if !vimwiki#u#ft_is_vw()
    return
  endif
  let line = getline(a:lnum)