commit 2f59cc208019f5f74e09178a29ab78b6df22e441
parent 864462200090315f1a59630791b46e63067cc42f
Author: Martin Grenfell <martin.grenfell@gmail.com>
Date: Tue, 8 Jul 2014 09:47:38 +0100
Merge branch 'master' into expt_add_path_flags_and_git
Diffstat:
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/autoload/nerdtree/ui_glue.vim b/autoload/nerdtree/ui_glue.vim
@@ -550,7 +550,7 @@ function! nerdtree#ui_glue#setupCommands()
command! -n=0 -bar NERDTreeClose :call nerdtree#closeTreeIfOpen()
command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreatePrimary('<args>')
command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
- command! -n=0 -bar NERDTreeFind call nerdtree#ui_glue#findAndRevealPath()
+ command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
endfunction
diff --git a/lib/nerdtree/creator.vim b/lib/nerdtree/creator.vim
@@ -8,7 +8,7 @@ let g:NERDTreeCreator = s:Creator
"FUNCTION: s:Creator._bindMappings() {{{1
function! s:Creator._bindMappings()
"make <cr> do the same as the activate node mapping
- nnoremap <silent> <buffer> <cr> :call nerdtree#invokeKeyMap(g:NERDTreeMapActivateNode)<cr>
+ nnoremap <silent> <buffer> <cr> :call nerdtree#ui_glue#invokeKeyMap(g:NERDTreeMapActivateNode)<cr>
call g:NERDTreeKeyMap.BindAll()