Merge branch 'master' into up/master

Conflicts:
	lib/nerdtree/creator.vim
This commit is contained in:
Xuyuan Pang 2014-09-01 17:33:45 +08:00
commit 5d19452284

View File

@ -43,7 +43,7 @@ endfunction
function! s:Creator.createPrimary(name) function! s:Creator.createPrimary(name)
let path = self._pathForString(a:name) let path = self._pathForString(a:name)
if path == 0 if path == {}
return return
endif endif
@ -244,7 +244,7 @@ function! s:Creator._pathForString(str)
let path = g:NERDTreePath.New(dir) let path = g:NERDTreePath.New(dir)
catch /^NERDTree.InvalidArgumentsError/ catch /^NERDTree.InvalidArgumentsError/
call nerdtree#echo("No bookmark or directory found for: " . a:str) call nerdtree#echo("No bookmark or directory found for: " . a:str)
return return {}
endtry endtry
endif endif
if !path.isDirectory if !path.isDirectory