From 1e2b7ef98d87955f7b9e6d1cfcad49df7e47cd5b Mon Sep 17 00:00:00 2001 From: "Phil Runninger (mac)" Date: Mon, 2 Jul 2018 09:06:09 -0400 Subject: [PATCH] Remove AddDefaultGroupToSortOrder check from startup. The call to AddDefaultGroupToSortOrder in NERD_tree.vim is redundant because it's also done every time sortChildren is called. And since the check is done only once, there's no need for a function either. sortChildren now just contains the needed if statement. --- lib/nerdtree/tree_dir_node.vim | 4 +++- plugin/NERD_tree.vim | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/nerdtree/tree_dir_node.vim b/lib/nerdtree/tree_dir_node.vim index 17d9c7f..2f62ec3 100644 --- a/lib/nerdtree/tree_dir_node.vim +++ b/lib/nerdtree/tree_dir_node.vim @@ -607,7 +607,9 @@ endfunction " FUNCTION: TreeDirNode.sortChildren() {{{1 " Sort "self.children" by alphabetical order and directory priority. function! s:TreeDirNode.sortChildren() - call AddDefaultGroupToSortOrder() + if count(g:NERDTreeSortOrder, '*') < 1 + call add(g:NERDTreeSortOrder, '*') + endif let CompareFunc = function("nerdtree#compareNodesBySortKey") call sort(self.children, CompareFunc) endfunction diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim index eb02eaa..a8af089 100644 --- a/plugin/NERD_tree.vim +++ b/plugin/NERD_tree.vim @@ -24,15 +24,6 @@ let loaded_nerd_tree = 1 let s:old_cpo = &cpo set cpo&vim -"Function: AddDefaultGroupToSortOrder() function {{{2 -"This function adds the default grouping '*' to the sort sequence if it's not -"already in the list. -function! AddDefaultGroupToSortOrder() - if count(g:NERDTreeSortOrder, '*') < 1 - call add(g:NERDTreeSortOrder, '*') - endif -endfunction - "Function: s:initVariable() function {{{2 "This function is used to initialise a given variable to a given value. The "variable is only initialised if it does not exist prior @@ -90,8 +81,6 @@ call s:initVariable("g:NERDTreeCascadeSingleChildDir", 1) if !exists("g:NERDTreeSortOrder") let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$', '\.bak$', '\~$'] -else - call AddDefaultGroupToSortOrder() endif call s:initVariable("g:NERDTreeGlyphReadOnly", "RO")