diff --git a/README.markdown b/README.markdown index 60869de..e617809 100644 --- a/README.markdown +++ b/README.markdown @@ -44,11 +44,11 @@ The following features and functionality are provided by the NERD tree: as you left it * You can have a separate NERD tree for each tab, share trees across tabs, or a mix of both. - * By default the script overrides the default file browser (netw), so if - you :edit a directory a (slighly modified) NERD tree will appear in the + * By default the script overrides the default file browser (netrw), so if + you :edit a directory a (slightly modified) NERD tree will appear in the current window * A programmable menu system is provided (simulates right clicking on a node) - * one default menu plugin is provided to perform basic filesytem + * one default menu plugin is provided to perform basic filesystem operations (create/delete/move/copy files/directories) * There's an API for adding your own keymappings diff --git a/autoload/nerdtree.vim b/autoload/nerdtree.vim index b8f69dc..3a2d71a 100644 --- a/autoload/nerdtree.vim +++ b/autoload/nerdtree.vim @@ -98,7 +98,7 @@ function! nerdtree#createDefaultBindings() call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" }) - call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': s."chRootCwd" }) + call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#chRootCwd" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" }) call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" }) @@ -227,6 +227,19 @@ function! nerdtree#invokeKeyMap(key) call g:NERDTreeKeyMap.Invoke(a:key) endfunction +" FUNCTION: nerdtree#loadClassFiles() {{{2 +function! nerdtree#loadClassFiles() + runtime lib/nerdtree/path.vim + runtime lib/nerdtree/menu_controller.vim + runtime lib/nerdtree/menu_item.vim + runtime lib/nerdtree/key_map.vim + runtime lib/nerdtree/bookmark.vim + runtime lib/nerdtree/tree_file_node.vim + runtime lib/nerdtree/tree_dir_node.vim + runtime lib/nerdtree/opener.vim + runtime lib/nerdtree/creator.vim +endfunction + " FUNCTION: nerdtree#postSourceActions() {{{2 function! nerdtree#postSourceActions() call g:NERDTreeBookmark.CacheBookmarks(0) @@ -1011,7 +1024,7 @@ endfunction " FUNCTION: s:chRootCwd() {{{2 " changes the current root to CWD -function! s:chRootCwd() +function! nerdtree#chRootCwd() try let cwd = g:NERDTreePath.New(getcwd()) catch /^NERDTree.InvalidArgumentsError/ diff --git a/doc/NERD_tree.txt b/doc/NERD_tree.txt index 47f3472..bf03896 100644 --- a/doc/NERD_tree.txt +++ b/doc/NERD_tree.txt @@ -83,12 +83,12 @@ The following features and functionality are provided by the NERD tree: as you left it * You can have a separate NERD tree for each tab, share trees across tabs, or a mix of both. - * By default the script overrides the default file browser (netw), so if - you :edit a directory a (slighly modified) NERD tree will appear in the + * By default the script overrides the default file browser (netrw), so if + you :edit a directory a (slightly modified) NERD tree will appear in the current window * A programmable menu system is provided (simulates right clicking on a node) - * one default menu plugin is provided to perform basic filesytem + * one default menu plugin is provided to perform basic filesystem operations (create/delete/move/copy files/directories) * There's an API for adding your own keymappings @@ -228,7 +228,7 @@ gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs| O.......Recursively open the selected directory..................|NERDTree-O| x.......Close the current nodes parent...........................|NERDTree-x| X.......Recursively close all children of the current node.......|NERDTree-X| -e.......Edit the current dif.....................................|NERDTree-e| +e.......Edit the current dir.....................................|NERDTree-e| ...............same as |NERDTree-o|. double-click.......same as the |NERDTree-o| map. @@ -780,7 +780,7 @@ If set to 1, doing a > < will open up a "secondary" NERD tree instead of a netrw in the target window. -Secondary NERD trees behaves slighly different from a regular trees in the +Secondary NERD trees behaves slightly different from a regular trees in the following respects: 1. 'o' will open the selected file in the same window as the tree, replacing it. diff --git a/plugin/nerdtree/bookmark.vim b/lib/nerdtree/bookmark.vim similarity index 99% rename from plugin/nerdtree/bookmark.vim rename to lib/nerdtree/bookmark.vim index 0d37b47..5b845d8 100644 --- a/plugin/nerdtree/bookmark.vim +++ b/lib/nerdtree/bookmark.vim @@ -67,7 +67,7 @@ function! s:Bookmark.BookmarkNames() endfunction " FUNCTION: Bookmark.CacheBookmarks(silent) {{{1 -" Class method to read all bookmarks from the bookmarks file intialize +" Class method to read all bookmarks from the bookmarks file initialize " bookmark objects for each one. " " Args: diff --git a/plugin/nerdtree/creator.vim b/lib/nerdtree/creator.vim similarity index 100% rename from plugin/nerdtree/creator.vim rename to lib/nerdtree/creator.vim index ee5f740..7f0721f 100644 --- a/plugin/nerdtree/creator.vim +++ b/lib/nerdtree/creator.vim @@ -7,11 +7,11 @@ let g:NERDTreeCreator = s:Creator "FUNCTION: s:Creator._bindMappings() {{{1 function! s:Creator._bindMappings() - call g:NERDTreeKeyMap.BindAll() - "make do the same as the default 'o' mapping exec "nnoremap :call nerdtree#invokeKeyMap('". g:NERDTreeMapActivateNode ."')" + call g:NERDTreeKeyMap.BindAll() + command! -buffer -nargs=? Bookmark :call nerdtree#bookmarkNode('') command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#revealBookmark('') command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call nerdtree#openBookmark('') diff --git a/plugin/nerdtree/key_map.vim b/lib/nerdtree/key_map.vim similarity index 100% rename from plugin/nerdtree/key_map.vim rename to lib/nerdtree/key_map.vim diff --git a/plugin/nerdtree/menu_controller.vim b/lib/nerdtree/menu_controller.vim similarity index 100% rename from plugin/nerdtree/menu_controller.vim rename to lib/nerdtree/menu_controller.vim diff --git a/plugin/nerdtree/menu_item.vim b/lib/nerdtree/menu_item.vim similarity index 100% rename from plugin/nerdtree/menu_item.vim rename to lib/nerdtree/menu_item.vim diff --git a/plugin/nerdtree/opener.vim b/lib/nerdtree/opener.vim similarity index 100% rename from plugin/nerdtree/opener.vim rename to lib/nerdtree/opener.vim diff --git a/plugin/nerdtree/path.vim b/lib/nerdtree/path.vim similarity index 100% rename from plugin/nerdtree/path.vim rename to lib/nerdtree/path.vim diff --git a/plugin/nerdtree/tree_dir_node.vim b/lib/nerdtree/tree_dir_node.vim similarity index 100% rename from plugin/nerdtree/tree_dir_node.vim rename to lib/nerdtree/tree_dir_node.vim diff --git a/plugin/nerdtree/tree_file_node.vim b/lib/nerdtree/tree_file_node.vim similarity index 100% rename from plugin/nerdtree/tree_file_node.vim rename to lib/nerdtree/tree_file_node.vim diff --git a/plugin/NERD_tree.vim b/plugin/NERD_tree.vim index 6c19a3f..5bee03a 100644 --- a/plugin/NERD_tree.vim +++ b/plugin/NERD_tree.vim @@ -136,15 +136,7 @@ call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U") call s:initVariable("g:NERDTreeMapCWD", "CD") "SECTION: Load class files{{{2 -runtime plugin/nerdtree/path.vim -runtime plugin/nerdtree/menu_controller.vim -runtime plugin/nerdtree/menu_item.vim -runtime plugin/nerdtree/key_map.vim -runtime plugin/nerdtree/bookmark.vim -runtime plugin/nerdtree/tree_file_node.vim -runtime plugin/nerdtree/tree_dir_node.vim -runtime plugin/nerdtree/opener.vim -runtime plugin/nerdtree/creator.vim +call nerdtree#loadClassFiles() " SECTION: Commands {{{1 "============================================================