commit bf1eb62c327ddfb38afc2f822a865b59f5b3ff74
parent 827b3a89745eaddf84035a5f3010c33aafc574a3
Author: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 9 Feb 2015 09:18:21 +0100
Merge pull request #112 from t7ko/completion-fix-issue111
Use case sensitive/insensitive path comparison depending on the OS
Diffstat:
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/autoload/vimwiki/path.vim b/autoload/vimwiki/path.vim
@@ -9,6 +9,18 @@ function! vimwiki#path#chomp_slash(str) "{{{
return substitute(a:str, '[/\\]\+$', '', '')
endfunction "}}}
+" Define path-compare function, either case-sensitive or not, depending on OS.
+"{{{ " function! vimwiki#path#is_equal(p1, p2)
+if has('win32')
+ function! vimwiki#path#is_equal(p1, p2)
+ return a:p1 ==? a:p2
+ endfunction
+else
+ function! vimwiki#path#is_equal(p1, p2)
+ return a:p1 == a:p2
+ endfunction
+endif "}}}
+
" collapse sections like /a/b/../c to /a/c
function! vimwiki#path#normalize(path) "{{{
let path = a:path
@@ -56,7 +68,7 @@ function! vimwiki#path#path_common_pfx(path1, path2) "{{{
let idx = 0
let minlen = min([len(p1), len(p2)])
- while (idx < minlen) && (p1[idx] ==? p2[idx])
+ while (idx < minlen) && vimwiki#path#is_equal(p1[idx], p2[idx])
let idx = idx + 1
endwhile
if idx == 0
@@ -80,7 +92,7 @@ function! vimwiki#path#relpath(dir, file) "{{{
let result = []
let dir = split(a:dir, '/')
let file = split(a:file, '/')
- while (len(dir) > 0 && len(file) > 0) && dir[0] == file[0]
+ while (len(dir) > 0 && len(file) > 0) && vimwiki#path#is_equal(dir[0], file[0])
call remove(dir, 0)
call remove(file, 0)
endwhile