y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'multi_ft' into dev

Browse Source 
This allows setting multiple filetypes at the same time e.g. 'vimwiki.md'
Closes #817, resolves #830, resolves #461.
This commit is contained in:
Rane Brown
2020-04-03 13:31:36 -06:00
parent ca28174dcc 1e74443b5a
commit 78a41b79c6
6 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/vimwiki/base.vim
View File

@ -341,7 +341,7 @@ function! vimwiki#base#open_link(cmd, link, ...) abort
if is_wiki_link
if a:0
let vimwiki_prev_link = [a:1, []]
elseif &filetype ==# 'vimwiki'
elseif vimwiki#u#ft_is_vw()
let vimwiki_prev_link = [vimwiki#path#current_wiki_file(), getpos('.')]
endif
endif
@ -437,7 +437,7 @@ function! vimwiki#base#goto(...) abort
\ vimwiki#vars#get_wikilocal('path') . key . vimwiki#vars#get_wikilocal('ext'),
\ anchor,
\ vimwiki_prev_link,
\ &filetype ==# 'vimwiki')
\ vimwiki#u#ft_is_vw())
endfunction
@ -853,8 +853,8 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) abort
" Make sure no other plugin takes ownership over the new file. Vimwiki
" rules them all! Well, except for directories, which may be opened with
" Netrw
if &filetype !=# 'vimwiki' && fname !~? '\m/$'
setfiletype vimwiki
if !vimwiki#u#ft_is_vw() && fname !~? '\m/$'
call vimwiki#u#ft_set()
endif
endif
if a:anchor !=? ''