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

Merge remote-tracking branch 'upstream/dev' into 'upstream/tags'

Browse Source 
Conflicts:
	autoload/vimwiki/base.vim
This commit is contained in:
Ivan Tishchenko
2015-03-25 21:33:19 +03:00
parent 55adfca6a1 4ab0bdf3da
commit 28114d8c85
16 changed files with 228 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
syntax/vimwiki.vim
View File

@ -1,7 +1,6 @@
" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
" Vimwiki syntax file
" Author: Maxim Kim <habamax@gmail.com>
" Home: http://code.google.com/p/vimwiki/
" Home: https://github.com/vimwiki/vimwiki/
" Quit if syntax file is already loaded
if version < 600
@ -13,7 +12,8 @@ endif
"TODO do nothing if ...? (?)
let g:starttime = reltime() " start the clock
if VimwikiGet('maxhi')
let b:existing_wikifiles = vimwiki#base#get_wikilinks(g:vimwiki_current_idx)
let b:existing_wikifiles =
\ vimwiki#base#get_wikilinks(g:vimwiki_current_idx, 1)
let b:existing_wikidirs =
\ vimwiki#base#get_wiki_directories(g:vimwiki_current_idx)
endif