move the closeTree functions out of autoload

Remove `closeTreeIfOpen` and just make `closeTree` fail silently.

lib/nerdtree/creator.vim

@@ -56,7 +56,7 @@ function! s:Creator.createPrimary(name)
 
     if g:NERDTree.ExistsForTab()
         if g:NERDTree.IsOpen()
-            call nerdtree#closeTree()
+            call g:NERDTree.Close()
         endif
         unlet t:NERDTreeBufName
     endif
@@ -169,7 +169,7 @@ function! s:Creator.createMirror()
     endif
 
     if g:NERDTree.ExistsForTab() && g:NERDTree.IsOpen()
-        call nerdtree#closeTree()
+        call g:NERDTree.Close()
     endif
 
     let t:NERDTreeBufName = bufferName
@@ -340,7 +340,7 @@ function! s:Creator.togglePrimary(dir)
             endif
             call b:NERDTree.ui.restoreScreenState()
         else
-            call nerdtree#closeTree()
+            call g:NERDTree.Close()
         endif
     else
         call self.createPrimary(a:dir)

lib/nerdtree/nerdtree.vim

@@ -3,6 +3,38 @@
 let s:NERDTree = {}
 let g:NERDTree = s:NERDTree
 
+"FUNCTION: s:NERDTree.Close() {{{1
+"Closes the primary NERD tree window for this tab
+function! s:NERDTree.Close()
+    if !s:NERDTree.IsOpen()
+        return
+    endif
+
+    if winnr("$") != 1
+        if winnr() == s:NERDTree.GetWinNum()
+            call nerdtree#exec("wincmd p")
+            let bufnr = bufnr("")
+            call nerdtree#exec("wincmd p")
+        else
+            let bufnr = bufnr("")
+        endif
+
+        call nerdtree#exec(s:NERDTree.GetWinNum() . " wincmd w")
+        close
+        call nerdtree#exec(bufwinnr(bufnr) . " wincmd w")
+    else
+        close
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.CloseIfQuitOnOpen() {{{1
+"Closes the NERD tree window if the close on open option is set
+function! s:NERDTree.CloseIfQuitOnOpen()
+    if g:NERDTreeQuitOnOpen && s:NERDTree.IsOpen()
+        call s:NERDTree.Close()
+    endif
+endfunction
+
 " Function: s:NERDTree.ExistsForBuffer()   {{{1
 " Returns 1 if a nerd tree root exists in the current buffer
 function! s:NERDTree.ExistsForBuf()
@@ -59,4 +91,3 @@ endfunction
 function! s:NERDTree.render()
     call self.ui.render()
 endfunction
-

lib/nerdtree/opener.vim

@@ -40,7 +40,7 @@ function! s:Opener._checkToCloseTree(newtab)
     endif
 
     if (a:newtab && self._where == 't') || !a:newtab
-        call nerdtree#closeTreeIfQuitOnOpen()
+        call g:NERDTree.CloseIfQuitOnOpen()
     endif
 endfunction