commit 5d194522849d6cc8d525dac653670e5a514ae109
parent a283c0e03ef3f5822e451a5a7b079cec00d372e3
Author: Xuyuan Pang <xuyuanp@gmail.com>
Date: Mon, 1 Sep 2014 17:33:45 +0800
Merge branch 'master' into up/master
Conflicts:
lib/nerdtree/creator.vim
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/nerdtree/creator.vim b/lib/nerdtree/creator.vim
@@ -43,7 +43,7 @@ endfunction
function! s:Creator.createPrimary(name)
let path = self._pathForString(a:name)
- if path == 0
+ if path == {}
return
endif
@@ -244,7 +244,7 @@ function! s:Creator._pathForString(str)
let path = g:NERDTreePath.New(dir)
catch /^NERDTree.InvalidArgumentsError/
call nerdtree#echo("No bookmark or directory found for: " . a:str)
- return
+ return {}
endtry
endif
if !path.isDirectory