Cherry-pick the changes from dev -- part2

This commit is contained in:
EinfachToll
2018-02-16 17:47:32 +01:00
parent 19f398c73e
commit 7d4254a75d
5 changed files with 105 additions and 99 deletions

View File

@ -75,7 +75,7 @@ function! vimwiki#path#path_common_pfx(path1, path2) "{{{
endfunction "}}}
function! vimwiki#path#wikify_path(path) "{{{
let result = resolve(expand(a:path, ':p'))
let result = resolve(fnamemodify(a:path, ':p'))
if vimwiki#u#is_windows()
let result = substitute(result, '\\', '/', 'g')
endif
@ -83,6 +83,12 @@ function! vimwiki#path#wikify_path(path) "{{{
return result
endfunction "}}}
function! vimwiki#path#current_wiki_file()
return vimwiki#path#wikify_path(expand('%:p'))
endfunction
" Returns: the relative path from a:dir to a:file
function! vimwiki#path#relpath(dir, file) "{{{
let result = []