diff --git a/lib/nerdtree/key_map.vim b/lib/nerdtree/key_map.vim index 2ee971d..6714ee4 100644 --- a/lib/nerdtree/key_map.vim +++ b/lib/nerdtree/key_map.vim @@ -66,7 +66,7 @@ endfunction "FUNCTION: KeyMap.invoke() {{{1 "Call the KeyMaps callback function function! s:KeyMap.invoke(...) - let Callback = type(self.callback) == v:t_func ? self.callback : function(self.callback) + let Callback = type(self.callback) == type(function("tr")) ? self.callback : function(self.callback) if a:0 call Callback(a:1) else diff --git a/lib/nerdtree/menu_item.vim b/lib/nerdtree/menu_item.vim index 2d5122d..8a74bb1 100644 --- a/lib/nerdtree/menu_item.vim +++ b/lib/nerdtree/menu_item.vim @@ -79,7 +79,7 @@ endfunction "specified function! s:MenuItem.enabled() if self.isActiveCallback != -1 - return type(self.isActiveCallback) == v:t_func ? self.isActiveCallback() : {self.isActiveCallback}() + return type(self.isActiveCallback) == type(function("tr")) ? self.isActiveCallback() : {self.isActiveCallback}() endif return 1 endfunction @@ -94,7 +94,7 @@ function! s:MenuItem.execute() call mc.showMenu() else if self.callback != -1 - if type(self.callback) == v:t_func + if type(self.callback) == type(function("tr")) call self.callback() else call {self.callback}() diff --git a/lib/nerdtree/notifier.vim b/lib/nerdtree/notifier.vim index cb290ca..dfd48b3 100644 --- a/lib/nerdtree/notifier.vim +++ b/lib/nerdtree/notifier.vim @@ -15,7 +15,7 @@ function! s:Notifier.NotifyListeners(event, path, nerdtree, params) let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params) for Listener in s:Notifier.GetListenersForEvent(a:event) - let Callback = type(Listener) == v:t_func ? Listener : function(Listener) + let Callback = type(Listener) == type(function("tr")) ? Listener : function(Listener) call Callback(event) endfor endfunction diff --git a/lib/nerdtree/path.vim b/lib/nerdtree/path.vim index 5f669f0..4ececf9 100644 --- a/lib/nerdtree/path.vim +++ b/lib/nerdtree/path.vim @@ -501,7 +501,7 @@ function! s:Path.ignore(nerdtree) endfor for Callback in g:NERDTree.PathFilters() - let Callback = type(Callback) == v:t_func ? Callback : function(Callback) + let Callback = type(Callback) == type(function("tr")) ? Callback : function(Callback) if Callback({'path': self, 'nerdtree': a:nerdtree}) return 1 endif