refactor: rename Path:isUnresolved to Path:isBroken.

feat: support for unresolved symlinks.
feat: jump to bookmark table shortcut. (#1394 )
2025-11-08 11:23:48 -05:00 · 2024-05-13 15:33:47 +03:30 · 2024-05-13 14:46:15 +03:30 · 2024-05-13 11:52:13 +03:30 · 2024-02-27 15:20:59 +03:30 · 2024-02-11 16:27:41 +03:30
21 changed files with 964 additions and 540 deletions
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,41 +5,42 @@ labels: bug
 ---
 <!-- Attention! Please Read!
-Please fill out ALL the information below so that the issue can be fully
+Please fill out ALL the information below so that the issue can be fully understood. Omitting
-understood. Omitting information will delay the resolution of your issue. It
+information will delay the resolution of your issue. It will be labeled "Needs More Info", and
-will be labeled "Needs More Info", and may be closed until there is enough
+may be closed until there is enough information.
 information.
-Keep in mind that others may have the same question in the future. The better
+Keep in mind that others may have the same question in the future. The better your information,
-your information, the more likely they'll be able to help themselves. -->
+the more likely they'll be able to help themselves.
 -->
 #### Self-Diagnosis
-<!-- Check the boxes after creating the issue, or use [x]. -->
+Before creating an issue, take some time to search these resources for an answer. It's possible that someone else has already seen and solved your issue.
- [ ] I have searched the [issues](https://github.com/scrooloose/nerdtree/issues) for an answer to my question.
+- [old NERDTree issues](https://github.com/preservim/nerdtree/issues?q=is%3Aissue)
- [ ] I have reviewed the NERDTree documentation. `:h NERDTree`
+- NERDTree documentation - `:h NERDTree`
- [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
+- [NERDTree Wiki](https://github.com/preservim/nerdtree/wiki)
- [ ] I have searched the web for an answer to my question.
+- Other resources: <https://stackoverflow.com>, <https://vi.stackexchange.com>, etc.
-#### Environment (for bug reports)
+#### Environment
- [ ] Operating System: 
+- Operating System: 
- [ ] Vim/Neovim version `:echo v:version`: 
+- Vim/Neovim version `:version`: 
- [ ] NERDTree version, found on 1st line in NERDTree quickhelp `?`: 
+- NERDTree version, found on first line of quickhelp `?`: 
- [ ] vimrc settings
+- Are you using any of these NERDTree-dependent plugins?  <!-- Check the boxes after creating the issue. -->
-    - [ ] NERDTree variables
+    - [ ] [Xuyuanp/nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin)
-    ```vim
+    - [ ] [ryanoasis/vim-devicons](https://github.com/ryanoasis/vim-devicons)
-    ```
+    - [ ] [tiagofumo/vim-nerdtree-syntax-highlight](https://github.com/tiagofumo/vim-nerdtree-syntax-highlight)
-    - Other NERDTree-dependent Plugins
+    - [ ] [scrooloose/nerdtree-project-plugin](https://github.com/scrooloose/nerdtree-project-plugin)
-        - [ ] jistr/vim-nerdtree-tabs
+    - [ ] [PhilRunninger/nerdtree-buffer-ops](https://github.com/PhilRunninger/nerdtree-buffer-ops)
-        - [ ] ryanoasis/vim-devicons
+    - [ ] [PhilRunninger/nerdtree-visual-selection](https://github.com/PhilRunninger/nerdtree-visual-selection)
-        - [ ] tiagofumo/vim-nerdtree-syntax-highlight
+    - [ ] [jistr/vim-nerdtree-tabs](https://github.com/jistr/vim-nerdtree-tabs)
-        - [ ] Xuyuanp/nerdtree-git-plugin
+    - [ ] Others (specify):
-        - [ ] Others (specify): 
+- Provide a minimal **.vimrc** file that will reproduce the issue.
-    - [ ] I've verified the issue occurs with only NERDTree installed.
+```vim
 ```
 #### Steps to Reproduce the Issue
 1. 
-#### Current Result (Include screenshots where appropriate.)
+#### Current Behavior (Include screenshots where appropriate.)
 #### Expected Result
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -3,22 +3,11 @@ name: "General Question"
 about: "Having trouble setting up NERDTree? Need clarification on a setting? Ask your question here."
 labels: "general question"
 ---
-<!-- Attention! Please Read!
+Before creating an issue, take some time to search these resources. It's possible that someone else has already asked your question and gotten an answer.
-
+- [old NERDTree issues](https://github.com/preservim/nerdtree/issues?q=is%3Aissue)
-Please fill out ALL the information below so that the issue can be fully
+- NERDTree documentation - `:h NERDTree`
-understood. Omitting information will delay the resolution of your issue. It
+- [NERDTree Wiki](https://github.com/preservim/nerdtree/wiki)
-will be labeled "Needs More Info", and may be closed until there is enough
+- Other resource: <https://stackoverflow.com>, <https://vi.stackexchange.com>, etc.
 information.
 Keep in mind that others may have the same question in the future. The better
 your information, the more likely they'll be able to help themselves. -->
 #### Self-Diagnosis
 <!-- Check the boxes after creating the issue, or use [x]. -->
 - [ ] I have searched the [issues](https://github.com/scrooloose/nerdtree/issues) for an answer to my question.
 - [ ] I have reviewed the NERDTree documentation. `:h NERDTree`
 - [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
 - [ ] I have searched the web for an answer to my question.
 #### State Your Question
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,16 +1,7 @@
 ### Description of Changes
-Closes #  <!-- Issue number this PR addresses. If none, remove this line. -->
+Closes #    <!-- Enter the issue number this PR addresses. If none, remove this line. -->
 ---
 ### New Version Info
 #### Author's Instructions
 - [ ] Derive a new `MAJOR.MINOR.PATCH` version number. Increment the:
    - `MAJOR` version when you make incompatible API changes
    - `MINOR` version when you add functionality in a backwards-compatible manner
    - `PATCH` version when you make backwards-compatible bug fixes
 - [ ] Update [CHANGELOG.md](https://github.com/scrooloose/nerdtree/blob/master/CHANGELOG.md), following the established pattern.
 #### Collaborator's Instructions
 - [ ] Review [CHANGELOG.md](https://github.com/scrooloose/nerdtree/blob/master/CHANGELOG.md), suggesting a different version number if necessary.
 - [ ] After merge, tag the merge commit, e.g. `git tag -a 3.1.4 -m "v3.1.4" && git push origin --tags`
--- a/.github/workflows/vint.yml
+++ b/.github/workflows/vint.yml
@@ -7,9 +7,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Checkout
-      uses: actions/checkout@master
+      uses: actions/checkout@v3
    - name: Run vint with reviewdog
-      uses: reviewdog/action-vint@v1.0.1
+      uses: reviewdog/action-vint@v1
      with:
        github_token: ${{ secrets.github_token }}
        reporter: github-pr-review
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,77 @@
     PATCH versions are listed from newest to oldest under their respective MAJOR.MINOR
     version in an unordered list.  The format is:
        - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
            or
        - **.PATCH**:
            - Pull Request Title 1 (PR Author) [PR Number](Link to PR)
            - Pull Request Title 2 (PR Author) [PR Number](Link to PR)
                .
                .
                .
            - Pull Request Title n (PR Author) [PR Number](Link to PR)
 -->
 #### 7.1
 - **.2**:
    - fix: GetWinNum regex pattern. (rzvxa) [#1409](https://github.com/preservim/nerdtree/pull/1409)
    - fix: session restore for nerdtree buffers. (rzvxa) [#1405](https://github.com/preservim/nerdtree/pull/1405)
 - **.1**:
    - fix: change default binding of filelines to `FL`. (rzvxa) [#1400](https://github.com/preservim/nerdtree/pull/1400)
    - fix: toggle zoom resizing. (ds2606) [#1395](https://github.com/preservim/nerdtree/pull/1395)
 - **.0**:
    - fix: typo in the docs. (bl4kraven) [#1390](https://github.com/preservim/nerdtree/pull/1390)
    - feat: add NERDTreeExplore command. (msibal6) [#1389](https://github.com/preservim/nerdtree/pull/1389)
    - fix: mapping description in NERDTree.txt. (roccomao) [#1393](https://github.com/preservim/nerdtree/pull/1393)
 #### 7.0
 - **.1**:
    - Fix NERDTreeFind to handle directory case sensitivity. (dangibson) [#1387](https://github.com/preservim/nerdtree/pull/1387)
    - New Show file lines toggle. (hsnks100) [#1384](https://github.com/preservim/nerdtree/pull/1384)
    - Add case sensitivity for refreshing nodes. (rzvxa) [#1382](https://github.com/preservim/nerdtree/pull/1382)
    - Clarified the NERDTreeChangePermissions prompt. (rzvxa) [#1381](https://github.com/preservim/nerdtree/pull/1381)
    - New reveal functionality for Windows. (rzvxa) [#1366](https://github.com/preservim/nerdtree/pull/1366)
    - Fix bracket escaping in path names. (kai-patel) [#1359](https://github.com/preservim/nerdtree/pull/1359)
    - Fix Case Sensitive Move Operation. (rzvxa) [#1375](https://github.com/preservim/nerdtree/pull/1375)
    - New menu command for changing selected node permissions. (mjkloeckner) [#1348](https://github.com/preservim/nerdtree/pull/1348)
    - Fix documentation errors. (BubuDavid) [#1372](https://github.com/preservim/nerdtree/pull/1372)
    - Fix typo in nerdtree.vim file. (SandeshPyakurel) [#1380](https://github.com/preservim/nerdtree/pull/1380)
 - **.0**:
    - Now we warn about invalid files instead of ignoring them silently. (rmonico) [#1365](https://github.com/preservim/nerdtree/pull/1365)
    - New g:NERDTreeWinPos options for top and bottom. (rzvxa) [#1363](https://github.com/preservim/nerdtree/pull/1363)
    - Fix error in README. (nickspoons) [#1330](https://github.com/preservim/nerdtree/pull/1330)
    - Fix typo in the documentation. (chapeupreto) [#1306](https://github.com/preservim/nerdtree/pull/1306)
 #### 6.10
 - **.16**: Fix documentation errors. (lifecrisis) [#1269](https://github.com/preservim/nerdtree/pull/1269)
 - **.15**: Ensure backward compatible testing of types. (lifecrisis) [#1266](https://github.com/preservim/nerdtree/pull/1266)
 - **.14**: Replace trim() with a version-compatible alternative. (PhilRunninger) [#1265](https://github.com/preservim/nerdtree/pull/1265)
 - **.13**: Change highlighting of bookmarks in the tree. (PhilRunninger) [#1261](https://github.com/preservim/nerdtree/pull/1261)
 - **.12**: Answer the question about accessing files over scp or ftp. (PhilRunninger) [#1259](https://github.com/preservim/nerdtree/pull/1259)
 - **.11**: Trim filenames created via the fs_menu (elanorigby) [#1243](https://github.com/preservim/nerdtree/pull/1243)
 - **.10**: Improve F.A.Q. Answers and Issue Templates (PhilRunninger) [#1249](https://github.com/preservim/nerdtree/pull/1249)
 - **.9**: `go` on a bookmark directory will NERDTreeFind it. (PhilRunninger) [#1236](https://github.com/preservim/nerdtree/pull/1236)
 - **.8**: Put `Callback` function variables in local scope. (PhilRunninger) [#1230](https://github.com/preservim/nerdtree/pull/1230)
 - **.7**: Fix mouse-clicking a file to open it. (PhilRunninger) [#1225](https://github.com/preservim/nerdtree/pull/1225)
 - **.6**: Restore the default behavior of the `<CR>` key. (PhilRunninger) [#1221](https://github.com/preservim/nerdtree/pull/1221)
 - **.5**: Fix `{'keepopen':0}` in NERDTreeCustomOpenArgs (PhilRunninger) [#1217](https://github.com/preservim/nerdtree/pull/1217)
 - **.4**: Removed directory separator from sort key (Daniel E) [#1219](https://github.com/preservim/nerdtree/pull/1219)
 - **.3**: Add new FAQ and answer: How to prevent buffers replacing NERDTree. (PhilRunninger) [#1215](https://github.com/preservim/nerdtree/pull/1215)
 - **.2**: New menu command: Run a system command in this directory. (PhilRunninger) [#1214](https://github.com/preservim/nerdtree/pull/1214)
 - **.1**: Escape quotation marks so they can be used in key mappings. (PhilRunninger) [#1213](https://github.com/preservim/nerdtree/pull/1213)
 - **.0**: Enable full path specifications for NERDTreeIgnore (PhilRunninger) [#1207](https://github.com/preservim/nerdtree/pull/1207)
 #### 6.9
 - **.12**: Respect NERDTreeCustomOpenArgs when opening bookmark (przepompownia) [#1200](https://github.com/preservim/nerdtree/pull/1200)
 - **.11**: Revamp the README. (buncis, PhilRunninger) [#1192](https://github.com/preservim/nerdtree/pull/1192), [#1193](https://github.com/preservim/nerdtree/pull/1193)
 - **.10**: Open a mirrored NERDTree with correct width (PhilRunninger) [#1177](https://github.com/preservim/nerdtree/pull/1177)
 - **.9**: Updated Readme, removed typo (H3RSKO) [#1167](https://github.com/preservim/nerdtree/pull/1167)
 - **.8**: Refactor sort comparison functions, removing redundancy (PhilRunninger) [#1166](https://github.com/preservim/nerdtree/pull/1166)
 - **.7**: Fix argument of `exists()` function calls checking for autocommands. (PhilRunninger) [#1165](https://github.com/preservim/nerdtree/pull/1165)
 - **.6**: Don't use silent when raising User events (PhilRunninger) [#1164](https://github.com/preservim/nerdtree/pull/1164)
 - **.5**: Fix highlight for file node.  (pirey) [#1157](https://github.com/preservim/nerdtree/pull/1157)
 - **.4**: Make sure symbolic links' flags are highlighted correctly.  (PhilRunninger) [#1156](https://github.com/preservim/nerdtree/pull/1156)
 - **.3**: Fix new NERDTrees' width when previous one was in the only window. (PhilRunninger) [#1153](https://github.com/preservim/nerdtree/pull/1153)
 - **.2**: Fix the scope of several key mappings (lifecrisis, PhilRunninger) [#1151](https://github.com/preservim/nerdtree/pull/1151)
 - **.1**: Respect user's `&shellslash` setting in CopyNode and RemoveNode functions (PhilRunninger) [#1150](https://github.com/preservim/nerdtree/pull/1150)
 - **.0**: Enable opening bookmarks in split windows. (PhilRunninger) [#1144](https://github.com/preservim/nerdtree/pull/1144)
 #### 6.8
 - **.0**: Allow concealed characters to show another character. (PhilRunninger) [#1138](https://github.com/preservim/nerdtree/pull/1138)
 #### 6.7
 - **.15**: Add curly braces to the list of characters to be escaped. (PhilRunninger) [#1128](https://github.com/preservim/nerdtree/pull/1128)
 - **.14**: Use backward-compatible `nerdtree#and()` in one place that was missed. (PhilRunninger) [#1134](https://github.com/preservim/nerdtree/pull/1134)
--- a/README.markdown
+++ b/README.markdown
@@ -1,157 +1,243 @@
-The NERDTree [![Vint](https://github.com/preservim/nerdtree/workflows/Vint/badge.svg)](https://github.com/preservim/nerdtree/actions?workflow=Vint)
+# The NERDTree [![Vint](https://github.com/preservim/nerdtree/workflows/Vint/badge.svg)](https://github.com/preservim/nerdtree/actions?workflow=Vint)
 =============
-Introduction
+## Introduction
 ------------
-The NERDTree is a file system explorer for the Vim editor. Using this plugin,
+The NERDTree is a file system explorer for the Vim editor. Using this plugin, users can visually browse complex directory hierarchies, quickly open files for reading or editing, and perform basic file system operations.
 users can visually browse complex directory hierarchies, quickly open files for
 reading or editing, and perform basic file system operations.
 This plugin can also be extended with custom mappings using a special API. The
 details of this API and of other NERDTree features are described in the
 included documentation.
 ![NERDTree Screenshot](https://github.com/preservim/nerdtree/raw/master/screenshot.png)
-Installation
+## Installation
 ------------
-Below are just some of the methods for installing NERDTree. Do not follow all of these instructions; just pick your favorite one. Other plugin managers exist, and NERDTree should install just fine with any of them.
+Use your favorite plugin manager to install this plugin. [tpope/vim-pathogen](https://github.com/tpope/vim-pathogen), [VundleVim/Vundle.vim](https://github.com/VundleVim/Vundle.vim), [junegunn/vim-plug](https://github.com/junegunn/vim-plug), and [Shougo/dein.vim](https://github.com/Shougo/dein.vim) are some of the more popular ones. A lengthy discussion of these and other managers can be found on [vi.stackexchange.com](https://vi.stackexchange.com/questions/388/what-is-the-difference-between-the-vim-plugin-managers). Basic instructions are provided below, but please **be sure to read, understand, and follow all the safety rules that come with your ~~power tools~~ plugin manager.**
-#### Vim 8+ packages
+If you have no favorite, or want to manage your plugins without 3rd-party dependencies, consider using Vim 8+ packages, as described in Greg Hurrell's excellent Youtube video: [Vim screencast #75: Plugin managers](https://www.youtube.com/watch?v=X2_R3uxDN6g).
-If you are using VIM version 8 or higher you can use its built-in package management; see `:help packages` for more information. Just run these commands in your terminal:
+<details>
 <summary>Pathogen</summary>
 Pathogen is more of a runtime path manager than a plugin manager. You must clone the plugins' repositories yourself to a specific location, and Pathogen makes sure they are available in Vim.
 1. In the terminal,
    ```bash
    git clone https://github.com/preservim/nerdtree.git ~/.vim/bundle/nerdtree
    ```
 1. In your `vimrc`,
    ```vim
    call pathogen#infect()
    syntax on
    filetype plugin indent on
    ```
 1. Restart Vim, and run `:helptags ~/.vim/bundle/nerdtree/doc/` or `:Helptags`.
 </details>
 <details>
  <summary>Vundle</summary>
 1. Install Vundle, according to its instructions.
 1. Add the following text to your `vimrc`.
    ```vim
    call vundle#begin()
      Plugin 'preservim/nerdtree'
    call vundle#end()
    ```
 1. Restart Vim, and run the `:PluginInstall` statement to install your plugins.
 </details>
 <details>
  <summary>Vim-Plug</summary>
 1. Install Vim-Plug, according to its instructions.
 1. Add the following text to your `vimrc`.
 ```vim
 call plug#begin()
  Plug 'preservim/nerdtree'
 call plug#end()
 ```
 1. Restart Vim, and run the `:PlugInstall` statement to install your plugins.
 </details>
 <details>
  <summary>Dein</summary>
 1. Install Dein, according to its instructions.
 1. Add the following text to your `vimrc`.
    ```vim
    call dein#begin()
      call dein#add('preservim/nerdtree')
    call dein#end()
    ```
 1. Restart Vim, and run the `:call dein#install()` statement to install your plugins.
 </details>
 <details>
 <summary>Vim 8+ packages</summary>
 If you are using Vim version 8 or higher you can use its built-in package management; see `:help packages` for more information. Just run these commands in your terminal:
 ```bash
 git clone https://github.com/preservim/nerdtree.git ~/.vim/pack/vendor/start/nerdtree
 vim -u NONE -c "helptags ~/.vim/pack/vendor/start/nerdtree/doc" -c q
 ```
 </details>
-Otherwise, these are some of the several 3rd-party plugin managers you can choose from. Be sure you read the instructions for your chosen plugin, as there typically are additional steps you nee d to take.
+## Getting Started
 After installing NERDTree, the best way to learn it is to turn on the Quick Help. Open NERDTree with the `:NERDTree` command, and press `?` to turn on the Quick Help, which will show you all the mappings and commands available in the NERDTree. Of course, your most complete source of information is the documentation: `:help NERDTree`.
-#### [pathogen.vim](https://github.com/tpope/vim-pathogen)
+## NERDTree Plugins
 NERDTree can be extended with custom mappings and functions using its built-in API. The details of this API are described in the included documentation. Several plugins have been written, and are available on Github for installation like any other plugin. The plugins in this list are maintained (or not) by their respective owners, and certain combinations may be incompatible.
-In the terminal,
+* [Xuyuanp/nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin): Shows Git status flags for files and folders in NERDTree.
-```bash
+* [ryanoasis/vim-devicons](https://github.com/ryanoasis/vim-devicons): Adds filetype-specific icons to NERDTree files and folders,
-git clone https://github.com/preservim/nerdtree.git ~/.vim/bundle/nerdtree
+* [tiagofumo/vim-nerdtree-syntax-highlight](https://github.com/tiagofumo/vim-nerdtree-syntax-highlight): Adds syntax highlighting to NERDTree based on filetype.
-```
+* [scrooloose/nerdtree-project-plugin](https://github.com/scrooloose/nerdtree-project-plugin): Saves and restores the state of the NERDTree between sessions.
-In your vimrc,
+* [PhilRunninger/nerdtree-buffer-ops](https://github.com/PhilRunninger/nerdtree-buffer-ops): 1) Highlights open files in a different color. 2) Closes a buffer directly from NERDTree.
 * [PhilRunninger/nerdtree-visual-selection](https://github.com/PhilRunninger/nerdtree-visual-selection): Enables NERDTree to open, delete, move, or copy multiple Visually-selected files at once.
 If any others should be listed, mention them in an issue or pull request.
 ## Frequently Asked Questions
 In the answers to these questions, you will see code blocks that you can put in your `vimrc` file.
 ### How can I map a specific key or shortcut to open NERDTree?
 NERDTree doesn't create any shortcuts outside of the NERDTree window, so as not to overwrite any of your other shortcuts. Use the `nnoremap` command in your `vimrc`. You, of course, have many keys and NERDTree commands to choose from. Here are but a few examples.
 ```vim
-call pathogen#infect()
+nnoremap <leader>n :NERDTreeFocus<CR>
-syntax on
+nnoremap <C-n> :NERDTree<CR>
-filetype plugin indent on
+nnoremap <C-t> :NERDTreeToggle<CR>
 nnoremap <C-f> :NERDTreeFind<CR>
 ```
-Then reload vim, run `:helptags ~/.vim/bundle/nerdtree/doc/` or `:Helptags`.
+### How do I open NERDTree automatically when Vim starts?
 Each code block below is slightly different, as described in the `" Comment lines`.
 #### [Vundle.vim](https://github.com/VundleVim/Vundle.vim)
 ```vim
-call vundle#begin()
+" Start NERDTree and leave the cursor in it.
-Plugin 'preservim/nerdtree'
+autocmd VimEnter * NERDTree
 call vundle#end()
 ```
 #### [vim-plug](https://github.com/junegunn/vim-plug)
 ```vim
 call plug#begin()
 Plug 'preservim/nerdtree'
 call plug#end()
 ```
 #### [dein.vim](https://github.com/Shougo/dein.vim)
 ```vim
 call dein#begin()
 call dein#add('preservim/nerdtree')
 call dein#end()
 ```
 #### [apt-vim](https://github.com/egalpin/apt-vim)
 ```bash
 apt-vim install -y https://github.com/preservim/nerdtree.git
 ```
 F.A.Q. (here, and in the [Wiki](https://github.com/preservim/nerdtree/wiki))
 ------
 #### Is there any support for `git` flags?
 Yes, install [nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin).
 ---
 #### Can I have the nerdtree on every tab automatically?
 Nope. If this is something you want then chances are you aren't using tabs and
 buffers as they were intended to be used. Read this
 http://stackoverflow.com/questions/102384/using-vims-tabs-like-buffers
 If you are interested in this behaviour then consider [vim-nerdtree-tabs](https://github.com/jistr/vim-nerdtree-tabs)
 ---
 #### How can I open a NERDTree automatically when vim starts up?
 Stick this in your vimrc: `autocmd vimenter * NERDTree`
 ---
 #### How can I open a NERDTree automatically when vim starts up if no files were specified?
 Stick this in your vimrc:
 ```vim
 " Start NERDTree and put the cursor back in the other window.
 autocmd VimEnter * NERDTree | wincmd p
 ```
 ---
 ```vim
 " Start NERDTree when Vim is started without file arguments.
 autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif
 ```
 Note: Now start vim with plain `vim`, not `vim .`
 ---
 #### What if I'm also opening a saved session, for example `vim -S session_file.vim`? I don't want NERDTree to open in that scenario.
 ```vim
 " Start NERDTree. If a file is specified, move the cursor to its window.
 autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 0 && !exists("s:std_in") && v:this_session == "" | NERDTree | endif
+autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif
 ```
 ---
 #### How can I open NERDTree automatically when vim starts up on opening a directory?
 ```vim
 " Start NERDTree, unless a file or session is specified, eg. vim -S session_file.vim.
 autocmd StdinReadPre * let s:std_in=1
-autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif
+autocmd VimEnter * if argc() == 0 && !exists('s:std_in') && v:this_session == '' | NERDTree | endif
 ```
 This window is tab-specific, meaning it's used by all windows in the tab. This trick also prevents NERDTree from hiding when first selecting a file.
 Note: Executing `vim ~/some-directory` will open NERDTree and a new edit window. `exe 'cd '.argv()[0]` sets the `pwd` of the new edit window to `~/some-directory`
 ---
 #### How can I map a specific key or shortcut to open NERDTree?
 Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want):
 ```vim
-map <C-n> :NERDTreeToggle<CR>
+" Start NERDTree when Vim starts with a directory argument.
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') |
    \ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif
 ```
 ### How can I close Vim or a tab automatically when NERDTree is the last window?
 ```vim
 " Exit Vim if NERDTree is the only window remaining in the only tab.
 autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
 ```
 ---
 #### How can I close vim if the only window left open is a NERDTree?
 Stick this in your vimrc:
 ```vim
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+" Close the tab if NERDTree is the only window remaining in it.
 autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
 ```
---
+### How can I prevent other buffers replacing NERDTree in its window?
 #### Can I have different highlighting for different file extensions?
 See here: https://github.com/preservim/nerdtree/issues/433#issuecomment-92590696
 ---
 #### How can I change default arrows?
 Use these variables in your vimrc. Note that below are default arrow symbols
 ```vim
-let g:NERDTreeDirArrowExpandable = '▸'
+" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree.
-let g:NERDTreeDirArrowCollapsible = '▾'
+autocmd BufEnter * if winnr() == winnr('h') && bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 |
    \ let buf=bufnr() | buffer# | execute "normal! \<C-W>w" | execute 'buffer'.buf | endif
 ```
-You can remove the arrows altogether by setting these variables to empty strings, as shown below. This will remove not only the arrows, but a single space following them, shifting the whole tree two character positions to the left.
+
 ### Can I have the same NERDTree on every tab automatically?
 ```vim
-let g:NERDTreeDirArrowExpandable = ''
+" Open the existing NERDTree on each new tab.
-let g:NERDTreeDirArrowCollapsible = ''
+autocmd BufWinEnter * if &buftype != 'quickfix' && getcmdwintype() == '' | silent NERDTreeMirror | endif
 ```
 or change your NERDTree-launching shortcut key like so:
 ```vim
 " Mirror the NERDTree before showing it. This makes it the same on all tabs.
 nnoremap <C-n> :NERDTreeMirror<CR>:NERDTreeFocus<CR>
 ```
 ### How can I change the default arrows?
 ```vim
 let g:NERDTreeDirArrowExpandable = '?'
 let g:NERDTreeDirArrowCollapsible = '?'
 ```
 The preceding values are the non-Windows default arrow symbols. Setting these variables to empty strings will remove the arrows completely and shift the entire tree two character positions to the left. See `:h NERDTreeDirArrowExpandable` for more details.
 ### How can I show lines of files?
 ```vim
 let g:NERDTreeFileLines = 1
 ```
 Lines in the file are displayed as shown below.
 ```
 </pack/packer/start/nerdtree/
 ▸ autoload/
 ▸ doc/
 ▸ lib/
 ▸ nerdtree_plugin/
 ▸ plugin/
 ▸ syntax/
  _config.yml (1)
  CHANGELOG.md (307)
  LICENCE (13)
  README.markdown (234)
  screenshot.png (219)
 ```
 ### Can NERDTree access remote files via scp or ftp?
 Short answer: No, and there are no plans to add that functionality. However, Vim ships with a plugin that does just that. It's called netrw, and by adding the following lines to your `.vimrc`, you can use it to open files over the `scp:`, `ftp:`, or other protocols, while still using NERDTree for all local files. The function seamlessly makes the decision to open NERDTree or netrw, and other supported protocols can be added to the regular expression.
 ```vim
 " Function to open the file or NERDTree or netrw.
 "   Returns: 1 if either file explorer was opened; otherwise, 0.
 function! s:OpenFileOrExplorer(...)
    if a:0 == 0 || a:1 == ''
        NERDTree
    elseif filereadable(a:1)
        execute 'edit '.a:1
        return 0
    elseif a:1 =~? '^\(scp\|ftp\)://' " Add other protocols as needed.
        execute 'Vexplore '.a:1
    elseif isdirectory(a:1)
        execute 'NERDTree '.a:1
    endif
    return 1
 endfunction
 " Auto commands to handle OS commandline arguments
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * if argc()==1 && !exists('s:std_in') | if <SID>OpenFileOrExplorer(argv()[0]) | wincmd p | enew | wincmd p | endif | endif
 " Command to call the OpenFileOrExplorer function.
 command! -n=? -complete=file -bar Edit :call <SID>OpenFileOrExplorer('<args>')
 " Command-mode abbreviation to replace the :edit Vim command.
 cnoreabbrev e Edit
 ```
--- a/autoload/nerdtree.vim
+++ b/autoload/nerdtree.vim
@@ -30,9 +30,21 @@ endfunction
 " SECTION: General Functions {{{1
 "============================================================
-"FUNCTION: nerdtree#slash() {{{2
+" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
-function! nerdtree#slash() abort
+function! nerdtree#closeTreeOnOpen() abort
    return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
 endfunction
 " FUNCTION: nerdtree#closeBookmarksOnOpen() {{{2
 function! nerdtree#closeBookmarksOnOpen() abort
    return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
 endfunction
 " FUNCTION: nerdtree#slash() {{{2
 " Return the path separator used by the underlying file system.  Special
 " consideration is taken for the use of the 'shellslash' option on Windows
 " systems.
 function! nerdtree#slash() abort
    if nerdtree#runningWindows()
        if exists('+shellslash') && &shellslash
            return '/'
@@ -44,28 +56,6 @@ function! nerdtree#slash() abort
    return '/'
 endfunction
 "FUNCTION: nerdtree#and(x,y) {{{2
 " Implements and() function for Vim <= 7.4
 function! nerdtree#and(x,y) abort
    if exists('*and')
        return and(a:x, a:y)
    else
        let l:x = a:x
        let l:y = a:y
        let l:n = 0
        let l:result = 0
        while l:x > 0 && l:y > 0
            if (l:x % 2) && (l:y % 2)
                let l:result += float2nr(pow(2, l:n))
            endif
            let l:x = float2nr(l:x / 2)
            let l:y = float2nr(l:y / 2)
            let l:n += 1
        endwhile
        return l:result
    endif
 endfunction
 "FUNCTION: nerdtree#checkForBrowse(dir) {{{2
 "inits a window tree in the current buffer if appropriate
 function! nerdtree#checkForBrowse(dir) abort
@@ -108,32 +98,32 @@ function! nerdtree#completeBookmarks(A,L,P) abort
    return filter(g:NERDTreeBookmark.BookmarkNames(), 'v:val =~# "^' . a:A . '"')
 endfunction
-"FUNCTION: nerdtree#compareNodes(dir) {{{2
+"FUNCTION: nerdtree#compareNodes(n1, n2) {{{2
 function! nerdtree#compareNodes(n1, n2) abort
-    return a:n1.path.compareTo(a:n2.path)
+    return nerdtree#compareNodePaths(a:n1.path, a:n2.path)
 endfunction
-"FUNCTION: nerdtree#compareNodesBySortKey(n1, n2) {{{2
+"FUNCTION: nerdtree#compareNodePaths(p1, p2) {{{2
-function! nerdtree#compareNodesBySortKey(n1, n2) abort
+function! nerdtree#compareNodePaths(p1, p2) abort
-    let sortKey1 = a:n1.path.getSortKey()
+    let sortKey1 = a:p1.getSortKey()
-    let sortKey2 = a:n2.path.getSortKey()
+    let sortKey2 = a:p2.getSortKey()
    let i = 0
    while i < min([len(sortKey1), len(sortKey2)])
        " Compare chunks upto common length.
        " If chunks have different type, the one which has
        " integer type is the lesser.
-        if type(sortKey1[i]) ==# type(sortKey2[i])
+        if type(sortKey1[i]) == type(sortKey2[i])
            if sortKey1[i] <# sortKey2[i]
                return - 1
            elseif sortKey1[i] ># sortKey2[i]
                return 1
            endif
-        elseif type(sortKey1[i]) ==# v:t_number
+        elseif type(sortKey1[i]) == type(0)
            return -1
-        elseif type(sortKey2[i]) ==# v:t_number
+        elseif type(sortKey2[i]) == type(0)
            return 1
        endif
-        let i = i + 1
+        let i += 1
    endwhile
    " Keys are identical upto common length.
@@ -208,16 +198,74 @@ function! nerdtree#postSourceActions() abort
    runtime! nerdtree_plugin/**/*.vim
 endfunction
-"FUNCTION: nerdtree#runningWindows(dir) {{{2
+"FUNCTION: nerdtree#runningWindows() {{{2
 function! nerdtree#runningWindows() abort
    return has('win16') || has('win32') || has('win64')
 endfunction
-"FUNCTION: nerdtree#runningCygwin(dir) {{{2
+"FUNCTION: nerdtree#runningCygwin() {{{2
 function! nerdtree#runningCygwin() abort
    return has('win32unix')
 endfunction
 "FUNCTION: nerdtree#runningMac() {{{2
 function! nerdtree#runningMac() abort
    return has('gui_mac') || has('gui_macvim') || has('mac') || has('osx')
 endfunction
 " FUNCTION: nerdtree#osDefaultCaseSensitiveFS() {{{2
 function! nerdtree#osDefaultCaseSensitiveFS() abort
    return s:osDefaultCaseSensitiveFS
 endfunction
 " FUNCTION: nerdtree#caseSensitiveFS() {{{2
 function! nerdtree#caseSensitiveFS() abort
    return g:NERDTreeCaseSensitiveFS == 1 ||
                \((g:NERDTreeCaseSensitiveFS == 2 || g:NERDTreeCaseSensitiveFS == 3) &&
                \nerdtree#osDefaultCaseSensitiveFS())
 endfunction
 "FUNCTION: nerdtree#pathEquals(lhs, rhs) {{{2
 function! nerdtree#pathEquals(lhs, rhs) abort
    if nerdtree#caseSensitiveFS()
        return a:lhs ==# a:rhs
    else
        return a:lhs ==? a:rhs
    endif
 endfunction
 "FUNCTION: nerdtree#onBufLeave() {{{2
 " used for handling the nerdtree BufLeave/WinLeave events.
 function! nerdtree#onBufLeave() abort
    " detect whether we are in the middle of sourcing a session.
    " if it is a buffer from the sourced session we need to restore it.
    if exists('g:SessionLoad') && !exists('b:NERDTree')
        let bname = bufname('%')
        " is the buffer for a tab tree?
        if bname =~# '^' . g:NERDTreeCreator.BufNamePrefix() . 'tab_\d\+$'
            " rename loaded buffer and mark it as trash to prevent this event
            " getting fired again
            exec 'file TRASH_' . bname
            " delete the trash buffer
            exec 'bwipeout!'
            " rescue the tab tree at the current working directory
            call g:NERDTreeCreator.CreateTabTree(getcwd())
        " is the buffer for a window tree?
        elseif bname =~# '^' . g:NERDTreeCreator.BufNamePrefix(). 'win_\d\+$'
            " rescue the window tree at the current working directory
            call g:NERDTreeCreator.CreateWindowTree(getcwd())
        else " unknown buffer type
            " rename buffer to mark it as broken.
            exec 'file BROKEN_' . bname
            call nerdtree#echoError('Failed to restore "' . bname . '" from session. Is this session created with an older version of NERDTree?')
        endif
    else
        if g:NERDTree.IsOpen()
            call b:NERDTree.ui.saveScreenState()
        endif
    endif
 endfunction
 " SECTION: View Functions {{{1
 "============================================================
@@ -256,4 +304,12 @@ function! nerdtree#renderView() abort
    call b:NERDTree.render()
 endfunction
 if nerdtree#runningWindows()
    let s:osDefaultCaseSensitiveFS = 0
 elseif nerdtree#runningMac()
    let s:osDefaultCaseSensitiveFS = 0
 else
    let s:osDefaultCaseSensitiveFS = 1
 endif
 " vim: set sw=4 sts=4 et fdm=marker:
--- a/autoload/nerdtree/ui_glue.vim
+++ b/autoload/nerdtree/ui_glue.vim
@@ -25,12 +25,16 @@ function! nerdtree#ui_glue#createDefaultBindings() abort
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Bookmark', 'callback': s.'previewBookmark' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': 'all', 'callback': s.'activateAll' })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': 'Node', 'callback': s.'openHSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': 'FileNode', 'callback': s.'openHSplit' })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': 'Node', 'callback': s.'openVSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': 'Bookmark', 'callback': s.'openHSplitBookmark' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': 'FileNode', 'callback': s.'openVSplit' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': 'Bookmark', 'callback': s.'openVSplitBookmark' })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'Node', 'callback': s.'previewNodeCurrent' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': 'FileNode', 'callback': s.'previewNodeCurrent' })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': 'Node', 'callback': s.'previewNodeVSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': 'FileNode', 'callback': s.'previewNodeHSplit' })
-    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': 'Node', 'callback': s.'previewNodeHSplit' })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': 'Bookmark', 'callback': s.'previewNodeHSplitBookmark' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': 'FileNode', 'callback': s.'previewNodeVSplit' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': 'Bookmark', 'callback': s.'previewNodeVSplitBookmark' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': 'DirNode', 'callback': s.'openNodeRecursively' })
@@ -53,6 +57,7 @@ function! nerdtree#ui_glue#createDefaultBindings() abort
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': 'all', 'callback': s.'toggleIgnoreFilter' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': 'all', 'callback': s.'toggleShowFiles' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': 'all', 'callback': s.'toggleShowBookmarks' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFileLines, 'scope': 'all', 'callback': s.'toggleShowFileLines' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': 'Node', 'callback': s.'closeCurrentDir' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': 'DirNode', 'callback': s.'closeChildren' })
@@ -65,6 +70,7 @@ function! nerdtree#ui_glue#createDefaultBindings() abort
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': 'all', 'callback': s.'jumpToRoot' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': 'Node', 'callback': s.'jumpToNextSibling' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': 'Node', 'callback': s.'jumpToPrevSibling' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpBookmarks, 'scope': 'all', 'callback': s.'jumpToBookmarks' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': 'Node', 'callback': s . 'openInNewTab' })
    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': 'Node', 'callback': s . 'openInNewTabSilent' })
@@ -104,10 +110,17 @@ function! s:customOpenBookmark(node) abort
 endfunction
 "FUNCTION: s:initCustomOpenArgs() {{{1
 " Make sure NERDTreeCustomOpenArgs has needed keys
 function! s:initCustomOpenArgs() abort
-    let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
+    let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
-    return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
+    try
        let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
        call  extend(g:NERDTreeCustomOpenArgs, l:defaultOpenArgs, 'keep')
    catch /^Vim(\a\+):E712:/
        call nerdtree#echoWarning('g:NERDTreeCustomOpenArgs is not set properly. Using default value.')
        let g:NERDTreeCustomOpenArgs = l:defaultOpenArgs
    finally
        return g:NERDTreeCustomOpenArgs
    endtry
 endfunction
 "FUNCTION: s:activateAll() {{{1
@@ -133,13 +146,13 @@ endfunction
 "FUNCTION: s:activateFileNode() {{{1
 "handle the user activating a tree node
 function! s:activateFileNode(node) abort
-    call a:node.activate({'reuse': 'all', 'where': 'p'})
+    call a:node.activate({'reuse': 'all', 'where': 'p', 'keepopen': !nerdtree#closeTreeOnOpen()})
 endfunction
 "FUNCTION: s:activateBookmark(bookmark) {{{1
 "handle the user activating a bookmark
 function! s:activateBookmark(bm) abort
-    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p'} : {})
+    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p', 'keepopen': !nerdtree#closeTreeOnOpen()} : {})
 endfunction
 " FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
@@ -362,7 +375,7 @@ function! s:handleLeftClick() abort
                if currentNode.path.isDirectory
                    call currentNode.activate()
                else
-                    call currentNode.activate({'reuse': 'all', 'where': 'p'})
+                    call currentNode.activate({'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()})
                endif
                return
            endif
@@ -484,6 +497,21 @@ function! s:jumpToSibling(node, forward) abort
    call b:NERDTree.ui.centerView()
 endfunction
 " FUNCTION: s:jumpToBookmarks() {{{1
 " moves the cursor to the bookmark table
 function! s:jumpToBookmarks() abort
    try
        if b:NERDTree.ui.getShowBookmarks()
            call g:NERDTree.CursorToBookmarkTable()
        else
            call b:NERDTree.ui.setShowBookmarks(1)
        endif
    catch /^NERDTree/
        call nerdtree#echoError('Failed to jump to the bookmark table')
        return
    endtry
 endfunction
 " FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
 " Open the Bookmark that has the specified name. This function provides the
 " implementation for the :OpenBookmark command.
@@ -496,19 +524,42 @@ function! nerdtree#ui_glue#openBookmark(name) abort
    endtry
    if l:bookmark.path.isDirectory
        call l:bookmark.open(b:NERDTree)
-    else
+        return
        call l:bookmark.open(b:NERDTree, {'where': 'p'})
    endif
    call l:bookmark.open(b:NERDTree, s:initCustomOpenArgs().file)
 endfunction
 " FUNCTION: s:openHSplit(target) {{{1
 function! s:openHSplit(target) abort
-    call a:target.activate({'where': 'h'})
+    call a:target.activate({'where': 'h', 'keepopen': !nerdtree#closeTreeOnOpen()})
 endfunction
 " FUNCTION: s:openVSplit(target) {{{1
 function! s:openVSplit(target) abort
-    call a:target.activate({'where': 'v'})
+    call a:target.activate({'where': 'v', 'keepopen': !nerdtree#closeTreeOnOpen()})
 endfunction
 "FUNCTION: s:openHSplitBookmark(bookmark) {{{1
 "handle the user activating a bookmark
 function! s:openHSplitBookmark(bm) abort
    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'h', 'keepopen': !nerdtree#closeTreeOnOpen()} : {})
 endfunction
 "FUNCTION: s:openVSplitBookmark(bookmark) {{{1
 "handle the user activating a bookmark
 function! s:openVSplitBookmark(bm) abort
    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'v', 'keepopen': !nerdtree#closeTreeOnOpen()} : {})
 endfunction
 " FUNCTION: s:previewHSplitBookmark(bookmark) {{{1
 function! s:previewNodeHSplitBookmark(bookmark) abort
    call a:bookmark.activate(b:NERDTree, !a:bookmark.path.isDirectory ? {'stay': 1, 'where': 'h', 'keepopen': 1} : {})
 endfunction
 " FUNCTION: s:previewVSplitBookmark(bookmark) {{{1
 function! s:previewNodeVSplitBookmark(bookmark) abort
    call a:bookmark.activate(b:NERDTree, !a:bookmark.path.isDirectory ? {'stay': 1, 'where': 'v', 'keepopen': 1} : {})
 endfunction
 " FUNCTION: s:openExplorer(node) {{{1
@@ -518,13 +569,13 @@ endfunction
 " FUNCTION: s:openInNewTab(target) {{{1
 function! s:openInNewTab(target) abort
-    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't'})
+    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't', 'keepopen': !nerdtree#closeTreeOnOpen()})
    call l:opener.open(a:target)
 endfunction
 " FUNCTION: s:openInNewTabSilent(target) {{{1
 function! s:openInNewTabSilent(target) abort
-    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't', 'stay': 1})
+    let l:opener = g:NERDTreeOpener.New(a:target.path, {'where': 't', 'keepopen': !nerdtree#closeTreeOnOpen(), 'stay': 1})
    call l:opener.open(a:target)
 endfunction
@@ -567,7 +618,7 @@ function! nerdtree#ui_glue#revealBookmark(name) abort
        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
        call targetNode.putCursorHere(0, 1)
    catch /^NERDTree.BookmarkNotFoundError/
-        call nerdtree#echo('Bookmark isnt cached under the current root')
+        call nerdtree#echo('Bookmark isn''t cached under the current root')
    endtry
 endfunction
@@ -607,6 +658,7 @@ endfunction
 function! nerdtree#ui_glue#setupCommands() abort
    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreateTabTree('<args>')
    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.ToggleTabTree('<args>')
    command! -n=? -complete=dir -bar NERDTreeExplore :call g:NERDTreeCreator.CreateExploreTree('<args>')
    command! -n=0 -bar NERDTreeClose :call g:NERDTree.Close()
    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreateTabTree('<args>')
    command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
@@ -651,6 +703,12 @@ function! s:toggleShowHidden() abort
    call b:NERDTree.ui.toggleShowHidden()
 endfunction
 " FUNCTION: s:toggleShowFileLines() {{{1
 " toggles the display of hidden files
 function! s:toggleShowFileLines() abort
    call b:NERDTree.ui.toggleShowFileLines()
 endfunction
 " FUNCTION: s:toggleZoom() {{{1
 function! s:toggleZoom() abort
    call b:NERDTree.ui.toggleZoom()
--- a/doc/NERDTree.txt
+++ b/doc/NERDTree.txt
@@ -116,7 +116,7 @@ The following features and functionality are provided by the NERDTree:
        :NERDTreeVCS              (opens root of repository containing CWD)
 <
 :NERDTreeFromBookmark <bookmark>                         *:NERDTreeFromBookmark*
-    Opens a fresh NERDTree with the root initialized to the dir for
+    Opens a fresh NERDTree with the root initialized to the directory for
    <bookmark>.  The only reason to use this command over :NERDTree is for
    the completion (which is for bookmarks rather than directories).
@@ -126,7 +126,7 @@ The following features and functionality are provided by the NERDTree:
    is set to that path. If no NERDTree exists for this tab then this command
    acts the same as the |:NERDTree| command.
-:NERDTreeToggleVCS [<start-directory> | <bookmark>]            *:NERDTreeToggleVCS*
+:NERDTreeToggleVCS [<start-directory> | <bookmark>]         *:NERDTreeToggleVCS*
    Like |:NERDTreeToggle|, but searches up the directory tree to find the top of
    the version control system repository, and roots the NERDTree there. It
    works with Git, Subversion, Mercurial, Bazaar, and Darcs repositories. A
@@ -249,7 +249,7 @@ Key      Description                                                  help-tag~
 o........Open files, directories and bookmarks......................|NERDTree-o|
 go.......Open selected file, but leave cursor in the NERDTree......|NERDTree-go|
-         Open selected bookmark dir in current NERDTree
+         Find selected bookmark directory in current NERDTree
 t........Open selected node/bookmark in a new tab...................|NERDTree-t|
 T........Same as 't' but keep the focus on the current tab..........|NERDTree-T|
 i........Open selected file in a split window.......................|NERDTree-i|
@@ -260,10 +260,10 @@ 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 dir.......................................|NERDTree-e|
+e........Edit the current directory.................................|NERDTree-e|
 double-click....same as |NERDTree-o|.
-middle-click....same as |NERDTree-i| for files, and |NERDTree-e| for dirs.
+middle-click....same as |NERDTree-i| for files, and |NERDTree-e| for directories.
 D........Delete the current bookmark ...............................|NERDTree-D|
@@ -274,19 +274,20 @@ J........Jump down inside directories at the current tree depth.....|NERDTree-J|
 <C-J>....Jump down to next sibling of the current directory.......|NERDTree-C-J|
 <C-K>....Jump up to previous sibling of the current directory.....|NERDTree-C-K|
-C........Change the tree root to the selected dir...................|NERDTree-C|
+C........Change the tree root to the selected directory.............|NERDTree-C|
 u........Move the tree root up one directory........................|NERDTree-u|
 U........Same as 'u' except the old root node is left open..........|NERDTree-U|
 r........Recursively refresh the current directory..................|NERDTree-r|
 R........Recursively refresh the current root.......................|NERDTree-R|
 m........Display the NERDTree menu..................................|NERDTree-m|
-cd.......Change the CWD to the dir of the selected node............|NERDTree-cd|
+cd.......Change the CWD to the directory of the selected node......|NERDTree-cd|
 CD.......Change tree root to the CWD...............................|NERDTree-CD|
 I........Toggle whether hidden files displayed......................|NERDTree-I|
 f........Toggle whether the file filters are used...................|NERDTree-f|
 F........Toggle whether files are displayed.........................|NERDTree-F|
 B........Toggle whether the bookmark table is displayed.............|NERDTree-B|
 L........Toggle whether the number of lines in files is displayed..|NERDTree-FL|
 q........Close the NERDTree window..................................|NERDTree-q|
 A........Zoom (maximize/minimize) the NERDTree window...............|NERDTree-A|
@@ -318,9 +319,8 @@ Applies to: files.
 If a file node or a bookmark that links to a file is selected, it is opened in
 the previous window, but the cursor does not move.
-If a bookmark that links to a directory is selected, that directory is found
+If a bookmark that links to a directory is selected then that directory
-in the current NERDTree. If the directory couldn't be found, a new NERDTree is
+becomes the new root.
 created.
 The default key combo for this mapping is "g" + NERDTreeMapActivateNode (see
 |NERDTree-o|).
@@ -350,7 +350,7 @@ The same as |NERDTree-t| except that the focus is kept in the current tab.
                                                                    *NERDTree-i*
 Default key: i
 Map setting: *NERDTreeMapOpenSplit*
-Applies to: files.
+Applies to: files, and bookmarks pointing to files.
 Opens the selected file in a new split window and puts the cursor in the new
 window.
@@ -359,7 +359,7 @@ window.
                                                                   *NERDTree-gi*
 Default key: gi
 Map setting: *NERDTreeMapPreviewSplit*
-Applies to: files.
+Applies to: files, and bookmarks pointing to files.
 The same as |NERDTree-i| except that the cursor is not moved.
@@ -370,7 +370,7 @@ The default key combo for this mapping is "g" + NERDTreeMapOpenSplit (see
                                                                    *NERDTree-s*
 Default key: s
 Map setting: *NERDTreeMapOpenVSplit*
-Applies to: files.
+Applies to: files, and bookmarks pointing to files.
 Opens the selected file in a new vertically split window and puts the cursor
 in the new window.
@@ -379,7 +379,7 @@ in the new window.
                                                                   *NERDTree-gs*
 Default key: gs
 Map setting: *NERDTreeMapPreviewVSplit*
-Applies to: files.
+Applies to: files, and bookmarks pointing to files.
 The same as |NERDTree-s| except that the cursor is not moved.
@@ -470,7 +470,7 @@ Jump to the first child of the current nodes parent.
 If the cursor is already on the first node then do the following:
    * loop back thru the siblings of the current nodes parent until we find an
-      open dir with children
+      open directory with children
    * go to the first child of that node
 ------------------------------------------------------------------------------
@@ -483,7 +483,7 @@ Jump to the last child of the current nodes parent.
 If the cursor is already on the last node then do the following:
    * loop forward thru the siblings of the current nodes parent until we find
-      an open dir with children
+      an open directory with children
    * go to the last child of that node
 ------------------------------------------------------------------------------
@@ -517,7 +517,7 @@ Default key: u
 Map setting: *NERDTreeMapUpdir*
 Applies to: no restrictions.
-Move the tree root up a dir (like doing a "cd ..").
+Move the tree root up a directory (like doing a "cd ..").
 ------------------------------------------------------------------------------
                                                                    *NERDTree-U*
@@ -533,8 +533,8 @@ Default key: r
 Map setting: *NERDTreeMapRefresh*
 Applies to: files and directories.
-If a dir is selected, recursively refresh that dir, i.e. scan the filesystem
+If a directory is selected, recursively refresh that directory, i.e. scan the
-for changes and represent them in the tree.
+filesystem for changes and represent them in the tree.
 If a file node is selected then the above is done on it's parent.
@@ -602,6 +602,14 @@ Applies to: no restrictions.
 Toggles whether the bookmarks table is displayed.
 ------------------------------------------------------------------------------
                                                                   *NERDTree-FL*
 Default key: FL
 Map setting: *NERDTreeMapToggleFileLines*
 Applies to: no restrictions.
 Toggles whether the number of lines in files is displayed.
 ------------------------------------------------------------------------------
                                                                    *NERDTree-q*
 Default key: q
@@ -635,8 +643,8 @@ file explorers have.
 The script comes with two default menu plugins: exec_menuitem.vim and
 fs_menu.vim. fs_menu.vim adds some basic filesystem operations to the menu for
-creating/deleting/moving/copying files and dirs. exec_menuitem.vim provides a
+creating/deleting/moving/copying files and directories. exec_menuitem.vim
-menu item to execute executable files.
+provides a menu item to execute executable files.
 Related tags: |NERDTree-m| |NERDTreeApi|
@@ -674,6 +682,9 @@ the NERDTree. These settings should be set in your vimrc, using `:let`.
 |NERDTreeAutoCenterThreshold| Controls the sensitivity of autocentering.
 |NERDTreeCaseSensitiveFS|     Tells the NERDTree whether or not it is
                            running in on a case sensitive file system.
 |NERDTreeCaseSensitiveSort|   Tells the NERDTree whether to be case
                            sensitive or not when sorting nodes.
@@ -809,6 +820,26 @@ Default: 3
 This setting controls the "sensitivity" of the NERDTree auto centering. See
 |NERDTreeAutoCenter| for details.
 ------------------------------------------------------------------------------
                                                     *NERDTreeCaseSensitiveFS*
 Values: 0, 1, 2 or 3.
 Default: 2.
 If set to 0, the NERDTree will interact with the file system without case
 sensitivity.
 If set to 1, the NERDTree will interact with the file system in a case-sensitive
 manner.
 If set to 2, the NERDTree assumes its case sensitivity from the OS it is
 running on. It Will default to case-insensitive on Windows and macOS
 machines and case-sensitive on everything else. Since it's not a foolproof
 way of detection, NERDTree won't proceed with any write actions when
 the destination is ambiguous.
 Setting it to 3 will perform just like 2, but without suppressing write
 actions.
 ------------------------------------------------------------------------------
                                                     *NERDTreeCaseSensitiveSort*
 Values: 0 or 1.
@@ -922,7 +953,7 @@ Default: ['\~$'].
 This setting is used to specify which files the NERDTree should ignore.  It
 must be a list of regular expressions. When the NERDTree is rendered, any
-files/dirs that match any of the regex's in NERDTreeIgnore won't be
+files/directories that match any of the regex's in NERDTreeIgnore won't be
 displayed.
 For example if you put the following line in your vimrc: >
@@ -930,13 +961,18 @@ For example if you put the following line in your vimrc: >
 <
 then all files ending in .vim or ~ will be ignored.
-There are 2 magic flags that can be appended to the end of each regular
+There are 3 magic flags that can be appended to the end of each regular
-expression to specify that the regex should match only files or only dirs.
+expression to specify that the regex should match only filenames, only lowest
-These flags are "[[dir]]" and "[[file]]". Example: >
+level directories, or a full path. These flags are "[[dir]]", "[[file]]", and
-    let NERDTreeIgnore=['\.d$[[dir]]', '\.o$[[file]]']
+"[[path]]". Example: >
    let NERDTreeIgnore=['\.d$[[dir]]', '\.o$[[file]]', 'tmp/cache$[[path]]']
 <
-This will cause all dirs ending in ".d" to be ignored and all files ending in
+This will cause all directories ending in ".d" to be ignored, all files ending
-".o" to be ignored.
+in ".o" to be ignored, and the "cache" subdirectory of any "tmp" directory to
 be ignored. All other "cache" directories will be displayed.
 When using the "[[path]]" tag on Windows, make sure you use escaped
 backslashes for the separators in the regex, eg. 'Temp\\cache$[[path]]'
 Note: to tell the NERDTree not to ignore any files you must use the following
 line: >
@@ -1036,6 +1072,20 @@ This setting can be toggled dynamically, per tree, with the |NERDTree-F|
 mapping and is useful for drastically shrinking the tree when you are
 navigating to a different part of the tree.
 ------------------------------------------------------------------------------
                                                        *NERDTreeShowFilesLines*
 Values: 0 or 1.
 Default: 0.
 If this setting is set to 1 then the NERDTree shows number of lines for each
 file.
 This setting can be toggled dynamically, per tree, with the |NERDTree-FL|
 mapping.
 Use one of the follow lines for this setting: >
    let NERDTreeShowFilesLines=0
    let NERDTreeShowFilesLines=1
 <
 ------------------------------------------------------------------------------
                                                            *NERDTreeShowHidden*
 Values: 0 or 1.
@@ -1100,8 +1150,8 @@ Examples: >
 <
 1. Directories will appear last, everything else will appear above.
 2. Everything will simply appear in alphabetical order.
-3. Dirs will appear first, then ruby and php. Swap files, bak files and vim
+3. Directories will appear first, then ruby and php. Swap files, bak files
-   backup files will appear last with everything else preceding them.
+   and vim backup files will appear last with everything else preceding them.
 4. Everything is sorted by size, largest to smallest, with directories
   considered to have size 0 bytes.
 5. Directories will appear first alphabetically, followed by files, sorted by
@@ -1124,7 +1174,7 @@ setting is used.
 ------------------------------------------------------------------------------
                                                                *NERDTreeWinPos*
-Values: "left" or "right"
+Values: "left", "right", "top" or "bottom"
 Default: "left".
 This setting is used to determine where NERDTree window is placed on the
@@ -1134,6 +1184,13 @@ This setting makes it possible to use two different explorer plugins
 simultaneously. For example, you could have the taglist plugin on the left of
 the window and the NERDTree on the right.
 When setting this variable to "top" or "bottom" make sure to also change the
 |NERDTreeWinSize| to a more reasonable size.
 For example:
 >
    let g:NERDTreeWinSize = 15
 <
 ------------------------------------------------------------------------------
                                                               *NERDTreeWinSize*
 Values: a positive integer.
@@ -1175,8 +1232,9 @@ Use one of the following lines for this setting: >
 Values: 0 or 1
 Default: 1.
-When displaying dir nodes, this setting tells NERDTree to collapse dirs that
+When displaying directory nodes, this setting tells NERDTree to collapse
-have only one child. Use one of the following lines for this setting: >
+directories that have only one child. Use one of the following lines for this
 setting: >
    let NERDTreeCascadeSingleChildDir=0
    let NERDTreeCascadeSingleChildDir=1
 <
@@ -1185,11 +1243,12 @@ have only one child. Use one of the following lines for this setting: >
 Values: 0 or 1
 Default: 1.
-When opening dir nodes, this setting tells NERDTree to recursively open dirs
+When opening directory nodes, this setting tells NERDTree to recursively open
-that have only one child which is also a dir. NERDTree will stop when it finds
+directories that have only one child which is also a directory. NERDTree will
-a dir that contains anything but another single dir. This setting also causes
+stop when it finds a directory that contains anything but another single
-the |NERDTree-x| mapping to close dirs in the same manner. This setting may be
+directory. This setting also causes the |NERDTree-x| mapping to close
-useful for Java projects. Use one of the following lines for this setting: >
+directories in the same manner. This setting may be useful for Java projects.
 Use one of the following lines for this setting: >
    let NERDTreeCascadeOpenSingleChildDir=0
    let NERDTreeCascadeOpenSingleChildDir=1
 <
@@ -1250,10 +1309,10 @@ responsible pull request: https://github.com/preservim/nerdtree/pull/868.
 The default value of this variable depends on the features compiled into your
 vim and the values of |NERDTreeDirArrowCollapsible| and
 |NERDTreeDirArrowExpandable|.
-  * If your vim is compiled with the +conceal feature, it is the "\x07" (BELL)
+  * If your vim is compiled with the +conceal feature, it is the "\x07"
-    character, and it is hidden by setting 'conceallevel' to 3. If you use
+    (BEL) character, and it is hidden by setting 'conceallevel' to 2. If you
-    autocommands, make sure none of them change that setting in the NERDTree_*
+    use autocommands, make sure none of them change that setting in the
-    buffers.
+    NERD_Tree_* buffers.
  * If your vim does NOT have the +conceal feature and you're using "\u00a0"
    (non-breaking space) to hide the directory arrows, "\u00b7" (middle dot)
    is used as the default delimiter.
@@ -1363,8 +1422,8 @@ NERDTreeAddKeyMap({options})                               *NERDTreeAddKeyMap()*
 <
    This code should sit in a file like ~/.vim/nerdtree_plugin/mymapping.vim.
    It adds a (redundant) mapping on 'foo' which changes vim's CWD to that of
-    the current dir node. Note this mapping will only fire when the cursor is
+    the current directory node. Note this mapping will only fire when the
-    on a directory node.
+    cursor is on a directory node.
 ------------------------------------------------------------------------------
 4.2. Menu API                                                  *NERDTreeMenuAPI*
--- a/lib/nerdtree/bookmark.vim
+++ b/lib/nerdtree/bookmark.vim
@@ -256,7 +256,7 @@ endfunction
 function! s:Bookmark.open(nerdtree, ...)
    let opts = a:0 ? a:1 : {}
-    if nerdtree#and(g:NERDTreeQuitOnOpen,2)
+    if nerdtree#closeBookmarksOnOpen()
        call a:nerdtree.ui.toggleShowBookmarks()
    endif
--- a/lib/nerdtree/creator.vim
+++ b/lib/nerdtree/creator.vim
@@ -28,7 +28,9 @@ endfunction
 " FUNCTION: s:Creator._broadcastInitEvent() {{{1
 function! s:Creator._broadcastInitEvent()
-    silent doautocmd User NERDTreeInit
+    if exists('#User#NERDTreeInit')
        doautocmd User NERDTreeInit
    endif
 endfunction
 " FUNCTION: s:Creator.BufNamePrefix() {{{1
@@ -36,6 +38,29 @@ function! s:Creator.BufNamePrefix()
    return 'NERD_tree_'
 endfunction
 " FUNCTION: s:Creator.CreateExploreTree(dir) {{{1
 function! s:Creator.CreateExploreTree(dir)
    try
        let path = g:NERDTreePath.New(a:dir)
    catch /^NERDTree.InvalidArgumentsError/
        call nerdtree#echo('Invalid directory name:' . a:dir)
        return
    endtry
    let creator = s:Creator.New()
    if getbufinfo('%')[0].changed && !&hidden && !&autowriteall
        let l:splitLocation = g:NERDTreeWinPos ==# 'left' || g:NERDTreeWinPos ==# 'top' ? 'topleft ' : 'botright '
        let l:splitDirection = g:NERDTreeWinPos ==# 'left' || g:NERDTreeWinPos ==# 'right' ? 'vertical' : ''
        silent! execute l:splitLocation . l:splitDirection . ' new'
    else
        silent! execute 'enew'
    endif
    call creator.createWindowTree(a:dir)
    "we want windowTree buffer to disappear after moving to any other buffer
    setlocal bufhidden=wipe
 endfunction
 " FUNCTION: s:Creator.CreateTabTree(a:name) {{{1
 function! s:Creator.CreateTabTree(name)
    let creator = s:Creator.New()
@@ -93,7 +118,7 @@ function! s:Creator.createWindowTree(dir)
    "we need a unique name for each window tree buffer to ensure they are
    "all independent
-    exec g:NERDTreeCreatePrefix . ' edit ' . self._nextBufferName()
+    exec g:NERDTreeCreatePrefix . ' edit ' . self._nextBufferName('win')
    call self._createNERDTree(path, 'window')
    let b:NERDTree._previousBuf = bufnr(previousBuf)
@@ -170,6 +195,7 @@ function! s:Creator.createMirror()
    let t:NERDTreeBufName = bufferName
    call self._createTreeWin()
    exec 'buffer ' .  bufferName
    call b:NERDTree.ui.restoreScreenState()
    if !&hidden
        call b:NERDTree.render()
    endif
@@ -179,16 +205,17 @@ endfunction
 " Initialize the NERDTree window.  Open the window, size it properly, set all
 " local options, etc.
 function! s:Creator._createTreeWin()
-    let l:splitLocation = g:NERDTreeWinPos ==# 'left' ? 'topleft ' : 'botright '
+    let l:splitLocation = g:NERDTreeWinPos ==# 'left' || g:NERDTreeWinPos ==# 'top' ? 'topleft ' : 'botright '
    let l:splitDirection = g:NERDTreeWinPos ==# 'left' || g:NERDTreeWinPos ==# 'right' ? 'vertical' : ''
    let l:splitSize = g:NERDTreeWinSize
    if !g:NERDTree.ExistsForTab()
-        let t:NERDTreeBufName = self._nextBufferName()
+        let t:NERDTreeBufName = self._nextBufferName('tab')
-        silent! execute l:splitLocation . 'vertical ' . l:splitSize . ' new'
+        silent! execute l:splitLocation . l:splitDirection . ' ' . l:splitSize . ' new'
        silent! execute 'edit ' . t:NERDTreeBufName
-        silent! execute 'vertical resize '. l:splitSize
+        silent! execute l:splitDirection . ' resize '. l:splitSize
    else
-        silent! execute l:splitLocation . 'vertical ' . l:splitSize . ' split'
+        silent! execute l:splitLocation . l:splitDirection . ' ' . l:splitSize . ' split'
        silent! execute 'buffer ' . t:NERDTreeBufName
    endif
@@ -217,10 +244,22 @@ function! s:Creator.New()
    return newCreator
 endfunction
-" FUNCTION: s:Creator._nextBufferName() {{{1
+" FUNCTION: s:Creator._nextBufferName(type='') {{{1
-" returns the buffer name for the next nerd tree
+" gets an optional buffer type of either 'tab' or 'win'.
-function! s:Creator._nextBufferName()
+" returns the buffer name for the next nerd tree of such type.
-    let name = s:Creator.BufNamePrefix() . self._nextBufferNumber()
+function! s:Creator._nextBufferName(...)
    if a:0 > 0
        let type = a:1
    else
        let type = ''
    end
    let name = s:Creator.BufNamePrefix()
    if type ==# 'tab'
        let name = name . 'tab_'
    elseif type ==# 'win'
        let name = name . 'win_'
    endif
    let name = name . self._nextBufferNumber()
    return name
 endfunction
@@ -247,7 +286,7 @@ function! s:Creator._pathForString(str)
        "hack to get an absolute path if a relative path is given
        if dir =~# '^\.'
-            let dir = getcwd() . g:NERDTreePath.Slash() . dir
+            let dir = getcwd() . nerdtree#slash() . dir
        endif
        "hack to prevent removing slash if dir is the root of the file system.
--- a/lib/nerdtree/key_map.vim
+++ b/lib/nerdtree/key_map.vim
@@ -51,7 +51,7 @@ function! s:KeyMap.bind()
    else
        let keymapInvokeString = self.key
    endif
-    let keymapInvokeString = escape(keymapInvokeString, '\')
+    let keymapInvokeString = escape(keymapInvokeString, '\"')
    let premap = self.key ==# '<LeftRelease>' ? ' <LeftRelease>' : ' '
@@ -66,11 +66,11 @@ endfunction
 "FUNCTION: KeyMap.invoke() {{{1
 "Call the KeyMaps callback function
 function! s:KeyMap.invoke(...)
-    let Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
+    let l:Callback = type(self.callback) ==# type(function('tr')) ? self.callback : function(self.callback)
    if a:0
-        call Callback(a:1)
+        call l:Callback(a:1)
    else
-        call Callback()
+        call l:Callback()
    endif
 endfunction
--- a/lib/nerdtree/nerdtree.vim
+++ b/lib/nerdtree/nerdtree.vim
@@ -27,7 +27,9 @@ function! s:NERDTree.changeRoot(node)
    call self.render()
    call self.root.putCursorHere(0, 0)
-    silent doautocmd User NERDTreeNewRoot
+    if exists('#User#NERDTreeNewRoot')
        doautocmd User NERDTreeNewRoot
    endif
 endfunction
 "FUNCTION: s:NERDTree.Close() {{{1
@@ -63,14 +65,6 @@ function! s:NERDTree.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 nerdtree#and(g:NERDTreeQuitOnOpen,1) && s:NERDTree.IsOpen()
        call s:NERDTree.Close()
    endif
 endfunction
 "FUNCTION: s:NERDTree.CursorToBookmarkTable(){{{1
 "Places the cursor at the top of the bookmarks table
 function! s:NERDTree.CursorToBookmarkTable()
@@ -150,7 +144,7 @@ function! s:NERDTree.GetWinNum()
    " If WindowTree, there is no t:NERDTreeBufName variable. Search all windows.
    for w in range(1,winnr('$'))
-        if bufname(winbufnr(w)) =~# '^' . g:NERDTreeCreator.BufNamePrefix() . '\d\+$'
+        if bufname(winbufnr(w)) =~# '^' . g:NERDTreeCreator.BufNamePrefix() . 'win_\d\+$'
            return w
        endif
    endfor
--- a/lib/nerdtree/notifier.vim
+++ b/lib/nerdtree/notifier.vim
@@ -15,8 +15,8 @@ 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) == type(function('tr')) ? Listener : function(Listener)
+        let l:Callback = type(Listener) == type(function('tr')) ? Listener : function(Listener)
-        call Callback(event)
+        call l:Callback(event)
    endfor
 endfunction
--- a/lib/nerdtree/opener.vim
+++ b/lib/nerdtree/opener.vim
@@ -33,8 +33,7 @@ function! s:Opener._bufInWindows(bnum)
 endfunction
 " FUNCTION: Opener._checkToCloseTree(newtab) {{{1
-" Check the class options and global options (i.e. NERDTreeQuitOnOpen) to see
+" Check the class options to see if the tree should be closed now.
 " if the tree should be closed now.
 "
 " Args:
 " a:newtab - boolean. If set, only close the tree now if we are opening the
@@ -46,7 +45,7 @@ function! s:Opener._checkToCloseTree(newtab)
    endif
    if (a:newtab && self._where ==# 't') || !a:newtab
-        call g:NERDTree.CloseIfQuitOnOpen()
+        call g:NERDTree.Close()
    endif
 endfunction
@@ -174,9 +173,8 @@ function! s:Opener._newSplit()
    "resize the tree window if no other window was open before
    if onlyOneWin
        let size = exists('b:NERDTreeOldWindowSize') ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
        call nerdtree#exec('wincmd p', 1)
-        call nerdtree#exec('silent '. splitMode .' resize '. size, 1)
+        call nerdtree#exec('silent '. splitMode .' resize '. g:NERDTreeWinSize, 1)
        call nerdtree#exec('wincmd p', 0)
    endif
@@ -219,7 +217,7 @@ endfunction
 " FUNCTION: Opener._openFile() {{{1
 function! s:Opener._openFile()
-    if !self._stay && !nerdtree#and(g:NERDTreeQuitOnOpen,1) && exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
+    if !self._stay && self._keepopen && get(b:, 'NERDTreeZoomed', 0)
        call b:NERDTree.ui.toggleZoom()
    endif
--- a/lib/nerdtree/path.vim
+++ b/lib/nerdtree/path.vim
@@ -25,10 +25,10 @@ function! s:Path.AbsolutePathFor(pathStr)
    if l:prependWorkingDir
        let l:result = getcwd()
-        if l:result[-1:] ==# s:Path.Slash()
+        if l:result[-1:] == nerdtree#slash()
            let l:result = l:result . a:pathStr
        else
-            let l:result = l:result . s:Path.Slash() . a:pathStr
+            let l:result = l:result . nerdtree#slash() . a:pathStr
        endif
    endif
@@ -62,9 +62,32 @@ function! s:Path.cacheDisplayString() abort
    endif
    if self.isSymLink
-        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' -> ' . self.symLinkDest
+        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' -> '
        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . self.symLinkDest
        if self.isBroken
            let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . g:NERDTreeGlyphBroken
        endif
    endif
    if !self.isDirectory && b:NERDTree.ui.getShowFileLines() != 0
        let l:bufname = self.str({'format': 'Edit'})
        let l:lines = 0
        if executable('wc') 
            let l:lines = split(system('wc -l "'.l:bufname.'"'))[0]
        elseif nerdtree#runningWindows()
            let l:lines = substitute(system('type "'.l:bufname.'" | find /c /v ""'), '\n', '', 'g')
        else 
            let s:lines = readfile(l:bufname)
            let l:lines = 0
            for s:line in s:lines
                let l:lines += 1
                if l:lines >= 20000 
                    break
                endif
            endfor
        endif
        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' ('.l:lines.')'
    endif
    if self.isReadOnly
        let self.cachedDisplayString = self.addDelimiter(self.cachedDisplayString) . ' ['.g:NERDTreeGlyphReadOnly.']'
    endif
@@ -99,50 +122,6 @@ function! s:Path.changeToDir()
    endtry
 endfunction
 " FUNCTION: Path.compareTo() {{{1
 "
 " Compares this Path to the given path and returns 0 if they are equal, -1 if
 " this Path is 'less than' the given path, or 1 if it is 'greater'.
 "
 " Args:
 " path: the path object to compare this to
 "
 " Return:
 " 1, -1 or 0
 function! s:Path.compareTo(path)
    let thisPath = self.getLastPathComponent(1)
    let thatPath = a:path.getLastPathComponent(1)
    "if the paths are the same then clearly we return 0
    if thisPath ==# thatPath
        return 0
    endif
    let thisSS = self.getSortOrderIndex()
    let thatSS = a:path.getSortOrderIndex()
    "compare the sort sequences, if they are different then the return
    "value is easy
    if thisSS < thatSS
        return -1
    elseif thisSS > thatSS
        return 1
    else
        if !g:NERDTreeSortHiddenFirst
            let thisPath = substitute(thisPath, '^[._]', '', '')
            let thatPath = substitute(thatPath, '^[._]', '', '')
        endif
        "if the sort sequences are the same then compare the paths
        "alphabetically
        let pathCompare = g:NERDTreeCaseSensitiveSort ? thisPath <# thatPath : thisPath <? thatPath
        if pathCompare
            return -1
        else
            return 1
        endif
    endif
 endfunction
 " FUNCTION: Path.Create(fullpath) {{{1
 "
 " Factory method.
@@ -438,7 +417,7 @@ function! s:Path.getSortKey()
            let self._sortKey = [self.getSortOrderIndex()] + metadata
        endif
-        let path = self.getLastPathComponent(1)
+        let path = self.getLastPathComponent(0)
        if !g:NERDTreeSortHiddenFirst
            let path = substitute(path, '^[._]', '', '')
        endif
@@ -503,10 +482,10 @@ function! s:Path.ignore(nerdtree)
            endif
        endfor
-        for Callback in g:NERDTree.PathFilters()
+        for l:Callback in g:NERDTree.PathFilters()
-            let Callback = type(Callback) ==# type(function('tr')) ? Callback : function(Callback)
+            let l:Callback = type(l:Callback) ==# type(function('tr')) ? l:Callback : function(l:Callback)
-            if Callback({'path': self, 'nerdtree': a:nerdtree})
+            if l:Callback({'path': self, 'nerdtree': a:nerdtree})
-                return 1
+               return 1
            endif
        endfor
    endif
@@ -527,7 +506,10 @@ endfunction
 " returns true if this path matches the given ignore pattern
 function! s:Path._ignorePatternMatches(pattern)
    let pat = a:pattern
-    if strpart(pat,len(pat)-7) ==# '[[dir]]'
+    if strpart(pat,len(pat)-8) ==# '[[path]]'
        let pat = strpart(pat,0, len(pat)-8)
        return self.str() =~# pat
    elseif strpart(pat,len(pat)-7) ==# '[[dir]]'
        if !self.isDirectory
            return 0
        endif
@@ -571,7 +553,7 @@ function! s:Path.isUnder(parent)
        return 0
    endif
    for i in range(0, l:that_count-1)
-        if self.pathSegments[i] !=# a:parent.pathSegments[i]
+        if !nerdtree#pathEquals(self.pathSegments[i], a:parent.pathSegments[i])
            return 0
        endif
    endfor
@@ -595,11 +577,7 @@ endfunction
 " Args:
 " path: the other path obj to compare this with
 function! s:Path.equals(path)
-    if nerdtree#runningWindows()
+    return nerdtree#pathEquals(self.str(), a:path.str())
        return self.str() ==? a:path.str()
    else
        return self.str() ==# a:path.str()
    endif
 endfunction
 " FUNCTION: Path.New(pathStr) {{{1
@@ -614,23 +592,6 @@ function! s:Path.New(pathStr)
    return l:newPath
 endfunction
 " FUNCTION: Path.Slash() {{{1
 " Return the path separator used by the underlying file system.  Special
 " consideration is taken for the use of the 'shellslash' option on Windows
 " systems.
 function! s:Path.Slash()
    if nerdtree#runningWindows()
        if exists('+shellslash') && &shellslash
            return '/'
        endif
        return '\'
    endif
    return '/'
 endfunction
 " FUNCTION: Path.Resolve() {{{1
 " Invoke the vim resolve() function and return the result
 " This is necessary because in some versions of vim resolve() removes trailing
@@ -650,24 +611,33 @@ function! s:Path.readInfoFromDisk(fullpath)
    let fullpath = s:Path.WinToUnixPath(a:fullpath)
-    if getftype(fullpath) ==# 'fifo'
+    let ftype = getftype(fullpath)
    if ftype ==# 'fifo'
        throw 'NERDTree.InvalidFiletypeError: Cant handle FIFO files: ' . a:fullpath
    endif
    let self.pathSegments = filter(split(fullpath, '/'), '!empty(v:val)')
    let self.isReadOnly = 0
    if isdirectory(a:fullpath)
        let self.isDirectory = 1
    let self.isReadOnly = 0
    let self.isBroken = 0
    elseif filereadable(a:fullpath)
        let self.isDirectory = 0
        let self.isReadOnly = filewritable(a:fullpath) ==# 0
    let self.isBroken = 0
    elseif ftype ==# 'link'
    let self.isDirectory = 0
    let self.isReadOnly = 0
    let self.isBroken = 1
    else
    call nerdtree#echoWarning('invalid ' . a:fullpath . 'file type: ' . ftype)
        throw 'NERDTree.InvalidArgumentsError: Invalid path = ' . a:fullpath
    endif
    let self.isExecutable = 0
-    if !self.isDirectory
+    if !self.isDirectory && !self.isBroken
        let self.isExecutable = getfperm(a:fullpath) =~# 'x'
    endif
@@ -815,7 +785,7 @@ function! s:Path._strForEdit()
    " On Windows, the drive letter may be removed by "fnamemodify()".  Add it
    " back, if necessary.
-    if nerdtree#runningWindows() && l:result[0] ==# s:Path.Slash()
+    if nerdtree#runningWindows() && l:result[0] == nerdtree#slash()
        let l:result = self.drive . l:result
    endif
@@ -830,14 +800,14 @@ endfunction
 " FUNCTION: Path._strForGlob() {{{1
 function! s:Path._strForGlob()
-    let lead = s:Path.Slash()
+    let lead = nerdtree#slash()
    "if we are running windows then slap a drive letter on the front
    if nerdtree#runningWindows()
        let lead = self.drive . '\'
    endif
-    let toReturn = lead . join(self.pathSegments, s:Path.Slash())
+    let toReturn = lead . join(self.pathSegments, nerdtree#slash())
    if !nerdtree#runningWindows()
        let toReturn = escape(toReturn, self._escChars())
@@ -849,7 +819,7 @@ endfunction
 " Return the absolute pathname associated with this Path object.  The pathname
 " returned is appropriate for the underlying file system.
 function! s:Path._str()
-    let l:separator = s:Path.Slash()
+    let l:separator = nerdtree#slash()
    let l:leader = l:separator
    if nerdtree#runningWindows()
--- a/lib/nerdtree/tree_dir_node.vim
+++ b/lib/nerdtree/tree_dir_node.vim
@@ -121,8 +121,14 @@ function! s:TreeDirNode.findNode(path)
    if a:path.equals(self.path)
        return self
    endif
-    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+    if nerdtree#caseSensitiveFS()
-        return {}
+        if stridx(a:path.str(), self.path.str(), 0) ==# -1
            return {}
        endif
    else
        if stridx(tolower(a:path.str()), tolower(self.path.str()), 0) ==# -1
            return {}
        endif
    endif
    if self.path.isDirectory
@@ -236,7 +242,7 @@ function! s:TreeDirNode.getChildIndex(path)
    let z = self.getChildCount()
    while a < z
        let mid = (a+z)/2
-        let diff = a:path.compareTo(self.children[mid].path)
+        let diff = nerdtree#compareNodePaths(a:path, self.children[mid].path)
        if diff ==# -1
            let z = mid
@@ -278,8 +284,12 @@ function! s:TreeDirNode._glob(pattern, all)
    else
        let l:pathSpec = escape(fnamemodify(self.path.str({'format': 'Glob'}), ':.'), ',')
-        " On Windows, the drive letter may be removed by fnamemodify().
+        if nerdtree#runningWindows()
-        if nerdtree#runningWindows() && l:pathSpec[0] ==# g:NERDTreePath.Slash()
+            let l:pathSpec = substitute(l:pathSpec, "\\[\\(.*\\]\\)", "[[]\\1", "g")
        endif
        " On Windows, the drive letter may be removed by "fnamemodify()".
        if nerdtree#runningWindows() && l:pathSpec[0] == nerdtree#slash()
            let l:pathSpec = self.path.drive . l:pathSpec
        endif
    endif
@@ -289,7 +299,7 @@ function! s:TreeDirNode._glob(pattern, all)
    " See ':h version7.txt' and ':h version8.txt' for details on the
    " development of the glob() and globpath() functions.
    if v:version > 704 || (v:version ==# 704 && has('patch654'))
-        let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1, 0)
+        let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1, 1)
    elseif v:version ==# 704 && has('patch279')
        let l:globList = globpath(l:pathSpec, a:pattern, !g:NERDTreeRespectWildIgnore, 1)
    elseif v:version > 702 || (v:version ==# 702 && has('patch051'))
@@ -421,6 +431,7 @@ function! s:TreeDirNode._initChildren(silent)
    endif
    let invalidFilesFound = 0
    let invalidFiles = []
    for i in files
        try
            let path = g:NERDTreePath.New(i)
@@ -428,6 +439,7 @@ function! s:TreeDirNode._initChildren(silent)
            call g:NERDTreePathNotifier.NotifyListeners('init', path, self.getNerdtree(), {})
        catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
            let invalidFilesFound += 1
            let invalidFiles += [i]
        endtry
    endfor
@@ -437,7 +449,7 @@ function! s:TreeDirNode._initChildren(silent)
    call nerdtree#echo('')
    if invalidFilesFound
-        call nerdtree#echoWarning(invalidFilesFound . ' file(s) could not be loaded into the NERD tree')
+        call nerdtree#echoWarning(invalidFilesFound . ' Invalid file(s): ' . join(invalidFiles, ', '))
    endif
    return self.getChildCount()
 endfunction
@@ -564,12 +576,13 @@ function! s:TreeDirNode.refresh()
        let files = self._glob('*', 1) + self._glob('.*', 0)
        let newChildNodes = []
        let invalidFilesFound = 0
        let invalidFiles = []
        for i in files
            try
                "create a new path and see if it exists in this nodes children
                let path = g:NERDTreePath.New(i)
                let newNode = self.getChild(path)
-                if newNode !=# {}
+                if newNode !=# {} && path.str() ==# newNode.path.str()
                    call newNode.refresh()
                    call add(newChildNodes, newNode)
@@ -580,7 +593,8 @@ function! s:TreeDirNode.refresh()
                    call add(newChildNodes, newNode)
                endif
            catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
-                let invalidFilesFound = 1
+                let invalidFilesFound += 1
                let invalidFiles += [i]
            endtry
        endfor
@@ -589,7 +603,7 @@ function! s:TreeDirNode.refresh()
        call self.sortChildren()
        if invalidFilesFound
-            call nerdtree#echoWarning('some files could not be loaded into the NERD tree')
+            call nerdtree#echoWarning(invalidFilesFound . ' Invalid file(s): ' . join(invalidFiles, ', '))
        endif
    endif
 endfunction
@@ -666,7 +680,7 @@ function! s:TreeDirNode.sortChildren()
    if count(g:NERDTreeSortOrder, '*') < 1
        call add(g:NERDTreeSortOrder, '*')
    endif
-    let CompareFunc = function('nerdtree#compareNodesBySortKey')
+    let CompareFunc = function('nerdtree#compareNodes')
    call sort(self.children, CompareFunc)
    let g:NERDTreeOldSortOrder = g:NERDTreeSortOrder
 endfunction
--- a/lib/nerdtree/ui.vim
+++ b/lib/nerdtree/ui.vim
@@ -62,11 +62,16 @@ function! s:UI._dumpHelp()
        let help .= "\"\n\" ----------------------------\n"
        let help .= "\" Bookmark table mappings~\n"
        let help .= "\" double-click,\n"
        let help .= '" '. g:NERDTreeMapJumpBookmarks .": jump to bookmark table\n"
        let help .= '" '. g:NERDTreeMapActivateNode .": open bookmark\n"
        let help .= '" '. g:NERDTreeMapPreview .": preview file\n"
        let help .= '" '. g:NERDTreeMapPreview .": find dir in tree\n"
        let help .= '" '. g:NERDTreeMapOpenInTab.": open in new tab\n"
        let help .= '" '. g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
        let help .= '" '. g:NERDTreeMapOpenSplit .": open split\n"
        let help .= '" '. g:NERDTreeMapPreviewSplit .": preview split\n"
        let help .= '" '. g:NERDTreeMapOpenVSplit .": open vsplit\n"
        let help .= '" '. g:NERDTreeMapPreviewVSplit .": preview vsplit\n"
        let help .= '" '. g:NERDTreeMapCustomOpen .": custom open\n"
        let help .= '" '. g:NERDTreeMapDeleteBookmark .": delete bookmark\n"
@@ -99,6 +104,7 @@ function! s:UI._dumpHelp()
        let help .= '" '. g:NERDTreeMapToggleFilters .': file filters (' . (self.isIgnoreFilterEnabled() ? 'on' : 'off') . ")\n"
        let help .= '" '. g:NERDTreeMapToggleFiles .': files (' . (self.getShowFiles() ? 'on' : 'off') . ")\n"
        let help .= '" '. g:NERDTreeMapToggleBookmarks .': bookmarks (' . (self.getShowBookmarks() ? 'on' : 'off') . ")\n"
        let help .= '" '. g:NERDTreeMapToggleFileLines .': files lines (' . (self.getShowFileLines() ? 'on' : 'off') . ")\n"
        " add quickhelp entries for each custom key map
        let help .= "\"\n\" ----------------------------\n"
@@ -143,6 +149,7 @@ function! s:UI.New(nerdtree)
    let newObj._showFiles = g:NERDTreeShowFiles
    let newObj._showHidden = g:NERDTreeShowHidden
    let newObj._showBookmarks = g:NERDTreeShowBookmarks
    let newObj._showFileLines = g:NERDTreeFileLines
    return newObj
 endfunction
@@ -280,6 +287,11 @@ function! s:UI.getShowHidden()
    return self._showHidden
 endfunction
 " FUNCTION: s:UI.getShowFileLines() {{{1
 function! s:UI.getShowFileLines()
    return self._showFileLines
 endfunction
 " FUNCTION: s:UI._indentLevelFor(line) {{{1
 function! s:UI._indentLevelFor(line)
    " Replace multi-character DirArrows with a single space so the
@@ -364,7 +376,7 @@ function! s:UI.saveScreenState()
        call g:NERDTree.CursorToTreeWin()
        let self._screenState['oldPos'] = getpos('.')
        let self._screenState['oldTopLine'] = line('w0')
-        let self._screenState['oldWindowSize']= winwidth('')
+        let self._screenState['oldWindowSize'] = winnr('$')==1 ? g:NERDTreeWinSize : winwidth('')
        call nerdtree#exec(win . 'wincmd w', 1)
    catch
    endtry
@@ -471,10 +483,10 @@ function! s:UI.toggleIgnoreFilter()
    call self.centerView()
 endfunction
-" FUNCTION: s:UI.toggleShowBookmarks() {{{1
+" FUNCTION: s:UI.setShowBookmarks() {{{1
-" Toggle the visibility of the Bookmark table.
+" Sets the visibility of the Bookmark table.
-function! s:UI.toggleShowBookmarks()
+function! s:UI.setShowBookmarks(value)
-    let self._showBookmarks = !self._showBookmarks
+    let self._showBookmarks = a:value
    if self.getShowBookmarks()
        call self.nerdtree.render()
@@ -492,6 +504,12 @@ function! s:UI.toggleShowBookmarks()
    call self.centerView()
 endfunction
 " FUNCTION: s:UI.toggleShowBookmarks() {{{1
 " Toggle the visibility of the Bookmark table.
 function! s:UI.toggleShowBookmarks()
    call self.setShowBookmarks(!self._showBookmarks)
 endfunction
 " FUNCTION: s:UI.toggleShowFiles() {{{1
 " toggles the display of hidden files
 function! s:UI.toggleShowFiles()
@@ -508,12 +526,23 @@ function! s:UI.toggleShowHidden()
    call self.centerView()
 endfunction
 " FUNCTION: s:UI.toggleShowFileLines() {{{1
 " toggles the display of file lines
 function! s:UI.toggleShowFileLines()
    let self._showFileLines = !self._showFileLines
    call self.nerdtree.root.refresh()
    call self.renderViewSavingPosition()
    call self.centerView()
 endfunction
 " FUNCTION: s:UI.toggleZoom() {{{1
 " zoom (maximize/minimize) the NERDTree window
 function! s:UI.toggleZoom()
    if exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
-        let size = exists('b:NERDTreeOldWindowSize') ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        setlocal nowinfixwidth
-        call nerdtree#exec('silent vertical resize '. size, 1)
+        wincmd =
        setlocal winfixwidth
        call nerdtree#exec('silent vertical resize '. g:NERDTreeWinSize, 1)
        let b:NERDTreeZoomed = 0
    else
        call nerdtree#exec('vertical resize '. get(g:, 'NERDTreeWinSizeMax', ''), 1)
--- a/nerdtree_plugin/fs_menu.vim
+++ b/nerdtree_plugin/fs_menu.vim
@@ -23,8 +23,8 @@ call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callbac
 call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
 call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
-if has('gui_mac') || has('gui_macvim') || has('mac')
+if nerdtree#runningMac()
-    call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
+    call NERDTreeAddMenuItem({'text': '(r)eveal the current node in the Finder', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
    call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
 endif
@@ -35,6 +35,7 @@ if executable('xdg-open')
 endif
 if nerdtree#runningWindows()
    call NERDTreeAddMenuItem({'text': '(r)eveal the current node in the Explorer', 'shortcut': 'r', 'callback': 'NERDTreeRevealInExplorer'})
    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFileWindows'})
 endif
@@ -45,10 +46,15 @@ call NERDTreeAddMenuItem({'text': (has('clipboard')?'copy (p)ath to clipboard':'
 if has('unix') || has('osx')
    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
    call NERDTreeAddMenuItem({'text': '(C)hange node permissions', 'shortcut':'C', 'callback': 'NERDTreeChangePermissions'})
 else
    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
 endif
 if exists('*system')
    call NERDTreeAddMenuItem({'text': 'Run (s)ystem command in this directory', 'shortcut':'s', 'callback': 'NERDTreeSystemCommand'})
 endif
 "FUNCTION: s:inputPrompt(action){{{1
 "returns the string that should be prompted to the user for the given action
 "
@@ -144,28 +150,48 @@ function! s:renameBuffer(bufNum, newNodeName, isDirectory)
        let quotedFileName = fnameescape(a:newNodeName)
        let editStr = g:NERDTreePath.New(a:newNodeName).str({'format': 'Edit'})
    endif
    " 1. ensure that a new buffer is loaded
    call nerdtree#exec('badd ' . quotedFileName, 0)
    " 2. ensure that all windows which display the just deleted filename
    " display a buffer for a new filename.
    let s:originalTabNumber = tabpagenr()
    let s:originalWindowNumber = winnr()
-    call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . a:bufNum . " | exec ':e! " . editStr . "' | endif", 0)
+    let l:tempBufferName = 'NERDTreeRenameTempBuffer'
-    call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
+
-    call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
+    " 1. swap deleted file buffer with a temporary one
-    " 3. We don't need a previous buffer anymore
+    " this step is needed to compensate for case insensitive filesystems
    " 1.1. create an intermediate(temporary) buffer
    call nerdtree#exec('badd ' . l:tempBufferName, 0)
    let l:tempBufNum = bufnr(l:tempBufferName)
    " 1.2. ensure that all windows which display the just deleted filename
    " display the new temp buffer.
    call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . a:bufNum . " | exec ':e! " . l:tempBufferName . "' | endif", 0)
    " 1.3. We don't need the deleted file buffer anymore
    try
        call nerdtree#exec('confirm bwipeout ' . a:bufNum, 0)
    catch
        " This happens when answering Cancel if confirmation is needed. Do nothing.
    endtry
    " 2. swap temporary buffer with the new filename buffer
    " 2.1. create the actual new file buffer
    call nerdtree#exec('badd ' . quotedFileName, 0)
    " 2.2. ensure that all windows which display the temporary buffer
    " display a buffer for the new filename.
    call nerdtree#exec('tabdo windo if winbufnr(0) ==# ' . l:tempBufNum . " | exec ':e! " . editStr . "' | endif", 0)
    call nerdtree#exec('tabnext ' . s:originalTabNumber, 1)
    call nerdtree#exec(s:originalWindowNumber . 'wincmd w', 1)
    " 2.3. We don't need the temporary buffer anymore
    try
        call nerdtree#exec('confirm bwipeout ' . l:tempBufNum, 0)
    catch
        " This happens when answering Cancel if confirmation is needed. Do nothing.
    endtry
 endfunction
 "FUNCTION: NERDTreeAddNode(){{{1
 function! NERDTreeAddNode()
    let curDirNode = g:NERDTreeDirNode.GetSelected()
    let prompt = s:inputPrompt('add')
-    let newNodeName = input(prompt, curDirNode.path.str() . g:NERDTreePath.Slash(), 'file')
+    let newNodeName = substitute(input(prompt, curDirNode.path.str() . nerdtree#slash(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
    if newNodeName ==# ''
        call nerdtree#echo('Node Creation Aborted.')
@@ -201,8 +227,25 @@ function! NERDTreeMoveNode()
    let prompt = s:inputPrompt('move')
    let newNodePath = input(prompt, curNode.path.str(), 'file')
    while filereadable(newNodePath)
-        call nerdtree#echoWarning('This destination already exists. Try again.')
+        " allow renames with different casing when g:NERDTreeCaseSensitiveFS
-        let newNodePath = input(prompt, curNode.path.str(), 'file')
+        " is set to either 0 or 3 and the 2 paths are equal
        if (g:NERDTreeCaseSensitiveFS == 0 || g:NERDTreeCaseSensitiveFS == 3) &&
                    \nerdtree#pathEquals(curNode.path.str(), newNodePath)
            break
        endif
        call nerdtree#echoWarning('This destination already exists, Try again.')
        " inform the user about the flag if we think it is a false positive
        " when g:NERDTreeCaseSensitiveFS is set to 2
        if g:NERDTreeCaseSensitiveFS == 2 &&
                    \!nerdtree#osDefaultCaseSensitiveFS() &&
                    \nerdtree#pathEquals(curNode.path.str(), newNodePath)
            echon "\n(If it is a false positive please consider assigning NERDTreeCaseSensitiveFS's value)"
        endif
        " prompt the user again
        let newNodePath = substitute(input(prompt, curNode.path.str(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
    endwhile
@@ -252,8 +295,6 @@ endfunction
 " FUNCTION: NERDTreeDeleteNode() {{{1
 function! NERDTreeDeleteNode()
    let l:shellslash = &shellslash
    let &shellslash = 0
    let currentNode = g:NERDTreeFileNode.GetSelected()
    let confirmed = 0
@@ -289,7 +330,6 @@ function! NERDTreeDeleteNode()
    else
        call nerdtree#echo('delete aborted')
    endif
    let &shellslash = l:shellslash
 endfunction
 " FUNCTION: NERDTreeListNode() {{{1
@@ -332,13 +372,34 @@ function! NERDTreeListNodeWin32()
    call nerdtree#echo('node not recognized')
 endfunction
 " FUNCTION: NERDTreeChangePermissions() {{{1
 function! NERDTreeChangePermissions()
    let l:node = g:NERDTreeFileNode.GetSelected()
    let l:prompt = "change node permissions (chmod args): "
    let l:newNodePerm = input(l:prompt)
    if !empty(l:node)
        let l:path = l:node.path.str()
        let l:cmd = 'chmod ' .. newNodePerm .. ' ' .. path
        let l:error = split(system(l:cmd), '\n')
        if !empty(l:error)
            call nerdtree#echo(l:error[0])
        endif
        call b:NERDTree.root.refresh()
        call b:NERDTree.render()
        return
    endif
    call nerdtree#echo('node not recognized')
 endfunction
 " FUNCTION: NERDTreeCopyNode() {{{1
 function! NERDTreeCopyNode()
    let l:shellslash = &shellslash
    let &shellslash = 0
    let currentNode = g:NERDTreeFileNode.GetSelected()
    let prompt = s:inputPrompt('copy')
-    let newNodePath = input(prompt, currentNode.path.str(), 'file')
+    let newNodePath = substitute(input(prompt, currentNode.path.str(), 'file'), '\(^\s*\|\s*$\)', '', 'g')
    if newNodePath !=# ''
        "strip trailing slash
@@ -371,7 +432,6 @@ function! NERDTreeCopyNode()
    else
        call nerdtree#echo('Copy aborted.')
    endif
    let &shellslash = l:shellslash
    redraw!
 endfunction
@@ -455,6 +515,17 @@ function! NERDTreeExecuteFileLinux()
    call system('xdg-open ' . shellescape(l:node.path.str()))
 endfunction
 " FUNCTION: NERDTreeRevealInExplorer() {{{1
 function! NERDTreeRevealInExplorer()
    let l:node = g:NERDTreeFileNode.GetSelected()
    if empty(l:node)
        return
    endif
    call system('cmd.exe /c explorer /select, ' . shellescape(l:node.path.str()))
 endfunction
 " FUNCTION: NERDTreeExecuteFileWindows() {{{1
 function! NERDTreeExecuteFileWindows()
    let l:node = g:NERDTreeFileNode.GetSelected()
@@ -466,4 +537,21 @@ function! NERDTreeExecuteFileWindows()
    call system('cmd.exe /c start "" ' . shellescape(l:node.path.str()))
 endfunction
 " FUNCTION: NERDTreeSystemCommand() {{{1
 function! NERDTreeSystemCommand()
    let l:node = g:NERDTreeFileNode.GetSelected()
    if empty(l:node)
        return
    endif
    let l:cwd = getcwd()
    let l:directory = l:node.path.isDirectory ? l:node.path.str() : l:node.parent.path.str()
    execute 'cd '.l:directory
    let l:nl = nr2char(10)
    echo l:nl . system(input(l:directory . (nerdtree#runningWindows() ? '> ' : ' $ ')))
    execute 'cd '.l:cwd
 endfunction
 " vim: set sw=4 sts=4 et fdm=marker:
--- a/plugin/NERD_tree.vim
+++ b/plugin/NERD_tree.vim
@@ -26,141 +26,120 @@ let loaded_nerd_tree = 1
 let s:old_cpo = &cpoptions
 set cpoptions&vim
-"Function: s:initVariable() function {{{2
+"SECTION: Initialize variable calls and other random constants {{{2
-"This function is used to initialise a given variable to a given value. The
+let g:NERDTreeAutoCenter            = get(g:, 'NERDTreeAutoCenter',            1)
-"variable is only initialised if it does not exist prior
+let g:NERDTreeAutoCenterThreshold   = get(g:, 'NERDTreeAutoCenterThreshold',   3)
-"
+let g:NERDTreeCaseSensitiveFS       = get(g:, 'NERDTreeCaseSensitiveFS',       2)
-"Args:
+let g:NERDTreeCaseSensitiveSort     = get(g:, 'NERDTreeCaseSensitiveSort',     0)
-"var: the name of the var to be initialised
+let g:NERDTreeNaturalSort           = get(g:, 'NERDTreeNaturalSort',           0)
-"value: the value to initialise var to
+let g:NERDTreeSortHiddenFirst       = get(g:, 'NERDTreeSortHiddenFirst',       1)
-"
+let g:NERDTreeUseTCD                = get(g:, 'NERDTreeUseTCD',                0)
-"Returns:
+let g:NERDTreeChDirMode             = get(g:, 'NERDTreeChDirMode',             0)
-"1 if the var is set, 0 otherwise
+let g:NERDTreeCreatePrefix          = get(g:, 'NERDTreeCreatePrefix',          'silent')
-function! s:initVariable(var, value)
+let g:NERDTreeMinimalUI             = get(g:, 'NERDTreeMinimalUI',             0)
-    if !exists(a:var)
+let g:NERDTreeMinimalMenu           = get(g:, 'NERDTreeMinimalMenu',           0)
-        exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", 'g') . "'"
+let g:NERDTreeIgnore                = get(g:, 'NERDTreeIgnore',                ['\~$'])
-        return 1
+let g:NERDTreeBookmarksFile         = get(g:, 'NERDTreeBookmarksFile',         expand('$HOME') . '/.NERDTreeBookmarks')
-    endif
+let g:NERDTreeBookmarksSort         = get(g:, 'NERDTreeBookmarksSort',         1)
-    return 0
+let g:NERDTreeHighlightCursorline   = get(g:, 'NERDTreeHighlightCursorline',   1)
-endfunction
+let g:NERDTreeHijackNetrw           = get(g:, 'NERDTreeHijackNetrw',           1)
 let g:NERDTreeMarkBookmarks         = get(g:, 'NERDTreeMarkBookmarks',         1)
 let g:NERDTreeMouseMode             = get(g:, 'NERDTreeMouseMode',             1)
 let g:NERDTreeNotificationThreshold = get(g:, 'NERDTreeNotificationThreshold', 100)
 let g:NERDTreeQuitOnOpen            = get(g:, 'NERDTreeQuitOnOpen',            0)
 let g:NERDTreeRespectWildIgnore     = get(g:, 'NERDTreeRespectWildIgnore',     0)
 let g:NERDTreeShowBookmarks         = get(g:, 'NERDTreeShowBookmarks',         0)
 let g:NERDTreeShowFiles             = get(g:, 'NERDTreeShowFiles',             1)
 let g:NERDTreeShowHidden            = get(g:, 'NERDTreeShowHidden',            0)
 let g:NERDTreeShowLineNumbers       = get(g:, 'NERDTreeShowLineNumbers',       0)
 let g:NERDTreeSortDirs              = get(g:, 'NERDTreeSortDirs',              1)
 let g:NERDTreeFileLines             = get(g:, 'NERDTreeFileLines',             0)
 "SECTION: Init variable calls and other random constants {{{2
 call s:initVariable('g:NERDTreeAutoCenter', 1)
 call s:initVariable('g:NERDTreeAutoCenterThreshold', 3)
 call s:initVariable('g:NERDTreeCaseSensitiveSort', 0)
 call s:initVariable('g:NERDTreeNaturalSort', 0)
 call s:initVariable('g:NERDTreeSortHiddenFirst', 1)
 call s:initVariable('g:NERDTreeUseTCD', 0)
 call s:initVariable('g:NERDTreeChDirMode', 0)
 call s:initVariable('g:NERDTreeCreatePrefix', 'silent')
 call s:initVariable('g:NERDTreeMinimalUI', 0)
 call s:initVariable('g:NERDTreeMinimalMenu', 0)
 if !exists('g:NERDTreeIgnore')
    let g:NERDTreeIgnore = ['\~$']
 endif
 call s:initVariable('g:NERDTreeBookmarksFile', expand('$HOME') . '/.NERDTreeBookmarks')
 call s:initVariable('g:NERDTreeBookmarksSort', 1)
 call s:initVariable('g:NERDTreeHighlightCursorline', 1)
 call s:initVariable('g:NERDTreeHijackNetrw', 1)
 call s:initVariable('g:NERDTreeMarkBookmarks', 1)
 call s:initVariable('g:NERDTreeMouseMode', 1)
 call s:initVariable('g:NERDTreeNotificationThreshold', 100)
 call s:initVariable('g:NERDTreeQuitOnOpen', 0)
 call s:initVariable('g:NERDTreeRespectWildIgnore', 0)
 call s:initVariable('g:NERDTreeShowBookmarks', 0)
 call s:initVariable('g:NERDTreeShowFiles', 1)
 call s:initVariable('g:NERDTreeShowHidden', 0)
 call s:initVariable('g:NERDTreeShowLineNumbers', 0)
 call s:initVariable('g:NERDTreeSortDirs', 1)
 if !nerdtree#runningWindows() && !nerdtree#runningCygwin()
-    call s:initVariable('g:NERDTreeDirArrowExpandable', '▸')
+    let g:NERDTreeDirArrowExpandable  = get(g:, 'NERDTreeDirArrowExpandable',  '▸')
-    call s:initVariable('g:NERDTreeDirArrowCollapsible', '▾')
+    let g:NERDTreeDirArrowCollapsible = get(g:, 'NERDTreeDirArrowCollapsible', '▾')
 else
-    call s:initVariable('g:NERDTreeDirArrowExpandable', '+')
+    let g:NERDTreeDirArrowExpandable  = get(g:, 'NERDTreeDirArrowExpandable',  '+')
-    call s:initVariable('g:NERDTreeDirArrowCollapsible', '~')
+    let g:NERDTreeDirArrowCollapsible = get(g:, 'NERDTreeDirArrowCollapsible', '~')
 endif
-call s:initVariable('g:NERDTreeCascadeOpenSingleChildDir', 1)
+let g:NERDTreeCascadeOpenSingleChildDir = get(g:, 'NERDTreeCascadeOpenSingleChildDir', 1)
-call s:initVariable('g:NERDTreeCascadeSingleChildDir', 1)
+let g:NERDTreeCascadeSingleChildDir     = get(g:, 'NERDTreeCascadeSingleChildDir',     1)
-if !exists('g:NERDTreeSortOrder')
+let g:NERDTreeSortOrder    = get(g:, 'NERDTreeSortOrder', ['\/$', '*', '\.swp$', '\.bak$', '\~$'])
    let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
 endif
 let g:NERDTreeOldSortOrder = []
-call s:initVariable('g:NERDTreeGlyphReadOnly', 'RO')
+let g:NERDTreeGlyphReadOnly = get(g:, 'NERDTreeGlyphReadOnly', 'RO')
 let g:NERDTreeGlyphBroken = get(g:, 'NERDTreeGlyphBroken', ' [*broken]')
 if has('conceal')
-    call s:initVariable('g:NERDTreeNodeDelimiter', "\x07")
+    let g:NERDTreeNodeDelimiter = get(g:, 'NERDTreeNodeDelimiter', "\x07")
 elseif (g:NERDTreeDirArrowExpandable ==# "\u00a0" || g:NERDTreeDirArrowCollapsible ==# "\u00a0")
-    call s:initVariable('g:NERDTreeNodeDelimiter', "\u00b7")
+    let g:NERDTreeNodeDelimiter = get(g:, 'NERDTreeNodeDelimiter', "\u00b7")
 else
-    call s:initVariable('g:NERDTreeNodeDelimiter', "\u00a0")
+    let g:NERDTreeNodeDelimiter = get(g:, 'NERDTreeNodeDelimiter', "\u00a0")
 endif
-if !exists('g:NERDTreeStatusline')
+"the exists() crap here is a hack to stop vim spazzing out when
 "loading a session that was created with an open nerd tree. It spazzes
 "because it doesnt store b:NERDTree(its a b: var, and its a hash)
 let g:NERDTreeStatusline = get(g:, 'NERDTreeStatusline', "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}")
-    "the exists() crap here is a hack to stop vim spazzing out when
+let g:NERDTreeWinPos  = get(g:, 'NERDTreeWinPos', 'left')
-    "loading a session that was created with an open nerd tree. It spazzes
+let g:NERDTreeWinSize = get(g:, 'NERDTreeWinSize', 31)
    "because it doesnt store b:NERDTree(its a b: var, and its a hash)
    let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
 endif
 call s:initVariable('g:NERDTreeWinPos', 'left')
 call s:initVariable('g:NERDTreeWinSize', 31)
 "init the shell commands that will be used to copy nodes, and remove dir trees
 "
 "Note: the space after the command is important
 if nerdtree#runningWindows()
-    call s:initVariable('g:NERDTreeRemoveDirCmd', 'rmdir /s /q ')
+    let g:NERDTreeRemoveDirCmd = get(g:, 'NERDTreeRemoveDirCmd', 'rmdir /s /q ')
-    call s:initVariable('g:NERDTreeCopyDirCmd', 'xcopy /s /e /i /y /q ')
+    let g:NERDTreeCopyDirCmd   = get(g:, 'NERDTreeCopyDirCmd',   'xcopy /s /e /i /y /q ')
-    call s:initVariable('g:NERDTreeCopyFileCmd', 'copy /y ')
+    let g:NERDTreeCopyFileCmd  = get(g:, 'NERDTreeCopyFileCmd',  'copy /y ')
 else
-    call s:initVariable('g:NERDTreeRemoveDirCmd', 'rm -rf ')
+    let g:NERDTreeRemoveDirCmd = get(g:, 'NERDTreeRemoveDirCmd', 'rm -rf ')
-    call s:initVariable('g:NERDTreeCopyCmd', 'cp -r ')
+    let g:NERDTreeCopyCmd      = get(g:, 'NERDTreeCopyCmd',      'cp -r ')
 endif
 "SECTION: Init variable calls for key mappings {{{2
-call s:initVariable('g:NERDTreeMapCustomOpen', '<CR>')
+let g:NERDTreeMapCustomOpen      = get(g:, 'NERDTreeMapCustomOpen',      '<CR>')
-call s:initVariable('g:NERDTreeMapActivateNode', 'o')
+let g:NERDTreeMapJumpBookmarks   = get(g:, 'NERDTreeMapJumpBookmarks',   'gb')
-call s:initVariable('g:NERDTreeMapChangeRoot', 'C')
+let g:NERDTreeMapActivateNode    = get(g:, 'NERDTreeMapActivateNode',    'o')
-call s:initVariable('g:NERDTreeMapChdir', 'cd')
+let g:NERDTreeMapChangeRoot      = get(g:, 'NERDTreeMapChangeRoot',      'C')
-call s:initVariable('g:NERDTreeMapCloseChildren', 'X')
+let g:NERDTreeMapChdir           = get(g:, 'NERDTreeMapChdir',           'cd')
-call s:initVariable('g:NERDTreeMapCloseDir', 'x')
+let g:NERDTreeMapCloseChildren   = get(g:, 'NERDTreeMapCloseChildren',   'X')
-call s:initVariable('g:NERDTreeMapDeleteBookmark', 'D')
+let g:NERDTreeMapCloseDir        = get(g:, 'NERDTreeMapCloseDir',        'x')
-call s:initVariable('g:NERDTreeMapMenu', 'm')
+let g:NERDTreeMapDeleteBookmark  = get(g:, 'NERDTreeMapDeleteBookmark',  'D')
-call s:initVariable('g:NERDTreeMapHelp', '?')
+let g:NERDTreeMapMenu            = get(g:, 'NERDTreeMapMenu',            'm')
-call s:initVariable('g:NERDTreeMapJumpFirstChild', 'K')
+let g:NERDTreeMapHelp            = get(g:, 'NERDTreeMapHelp',            '?')
-call s:initVariable('g:NERDTreeMapJumpLastChild', 'J')
+let g:NERDTreeMapJumpFirstChild  = get(g:, 'NERDTreeMapJumpFirstChild',  'K')
-call s:initVariable('g:NERDTreeMapJumpNextSibling', '<C-j>')
+let g:NERDTreeMapJumpLastChild   = get(g:, 'NERDTreeMapJumpLastChild',   'J')
-call s:initVariable('g:NERDTreeMapJumpParent', 'p')
+let g:NERDTreeMapJumpNextSibling = get(g:, 'NERDTreeMapJumpNextSibling', '<C-j>')
-call s:initVariable('g:NERDTreeMapJumpPrevSibling', '<C-k>')
+let g:NERDTreeMapJumpParent      = get(g:, 'NERDTreeMapJumpParent',      'p')
-call s:initVariable('g:NERDTreeMapJumpRoot', 'P')
+let g:NERDTreeMapJumpPrevSibling = get(g:, 'NERDTreeMapJumpPrevSibling', '<C-k>')
-call s:initVariable('g:NERDTreeMapOpenExpl', 'e')
+let g:NERDTreeMapJumpRoot        = get(g:, 'NERDTreeMapJumpRoot',        'P')
-call s:initVariable('g:NERDTreeMapOpenInTab', 't')
+let g:NERDTreeMapOpenExpl        = get(g:, 'NERDTreeMapOpenExpl',        'e')
-call s:initVariable('g:NERDTreeMapOpenInTabSilent', 'T')
+let g:NERDTreeMapOpenInTab       = get(g:, 'NERDTreeMapOpenInTab',       't')
-call s:initVariable('g:NERDTreeMapOpenRecursively', 'O')
+let g:NERDTreeMapOpenInTabSilent = get(g:, 'NERDTreeMapOpenInTabSilent', 'T')
-call s:initVariable('g:NERDTreeMapOpenSplit', 'i')
+let g:NERDTreeMapOpenRecursively = get(g:, 'NERDTreeMapOpenRecursively', 'O')
-call s:initVariable('g:NERDTreeMapOpenVSplit', 's')
+let g:NERDTreeMapOpenSplit       = get(g:, 'NERDTreeMapOpenSplit',       'i')
-call s:initVariable('g:NERDTreeMapPreview', 'g' . NERDTreeMapActivateNode)
+let g:NERDTreeMapOpenVSplit      = get(g:, 'NERDTreeMapOpenVSplit',      's')
-call s:initVariable('g:NERDTreeMapPreviewSplit', 'g' . NERDTreeMapOpenSplit)
+let g:NERDTreeMapPreview         = get(g:, 'NERDTreeMapPreview',         'g'.NERDTreeMapActivateNode)
-call s:initVariable('g:NERDTreeMapPreviewVSplit', 'g' . NERDTreeMapOpenVSplit)
+let g:NERDTreeMapPreviewSplit    = get(g:, 'NERDTreeMapPreviewSplit',    'g'.NERDTreeMapOpenSplit)
-call s:initVariable('g:NERDTreeMapQuit', 'q')
+let g:NERDTreeMapPreviewVSplit   = get(g:, 'NERDTreeMapPreviewVSplit',   'g'.NERDTreeMapOpenVSplit)
-call s:initVariable('g:NERDTreeMapRefresh', 'r')
+let g:NERDTreeMapQuit            = get(g:, 'NERDTreeMapQuit',            'q')
-call s:initVariable('g:NERDTreeMapRefreshRoot', 'R')
+let g:NERDTreeMapRefresh         = get(g:, 'NERDTreeMapRefresh',         'r')
-call s:initVariable('g:NERDTreeMapToggleBookmarks', 'B')
+let g:NERDTreeMapRefreshRoot     = get(g:, 'NERDTreeMapRefreshRoot',     'R')
-call s:initVariable('g:NERDTreeMapToggleFiles', 'F')
+let g:NERDTreeMapToggleBookmarks = get(g:, 'NERDTreeMapToggleBookmarks', 'B')
-call s:initVariable('g:NERDTreeMapToggleFilters', 'f')
+let g:NERDTreeMapToggleFiles     = get(g:, 'NERDTreeMapToggleFiles',     'F')
-call s:initVariable('g:NERDTreeMapToggleHidden', 'I')
+let g:NERDTreeMapToggleFilters   = get(g:, 'NERDTreeMapToggleFilters',   'f')
-call s:initVariable('g:NERDTreeMapToggleZoom', 'A')
+let g:NERDTreeMapToggleHidden    = get(g:, 'NERDTreeMapToggleHidden',    'I')
-call s:initVariable('g:NERDTreeMapUpdir', 'u')
+let g:NERDTreeMapToggleFileLines = get(g:, 'NERDTreeMapToggleFileLines', 'FL')
-call s:initVariable('g:NERDTreeMapUpdirKeepOpen', 'U')
+let g:NERDTreeMapToggleZoom      = get(g:, 'NERDTreeMapToggleZoom',      'A')
-call s:initVariable('g:NERDTreeMapCWD', 'CD')
+let g:NERDTreeMapUpdir           = get(g:, 'NERDTreeMapUpdir',           'u')
-call s:initVariable('g:NERDTreeMenuDown', 'j')
+let g:NERDTreeMapUpdirKeepOpen   = get(g:, 'NERDTreeMapUpdirKeepOpen',   'U')
-call s:initVariable('g:NERDTreeMenuUp', 'k')
+let g:NERDTreeMapCWD             = get(g:, 'NERDTreeMapCWD',             'CD')
 let g:NERDTreeMenuDown           = get(g:, 'NERDTreeMenuDown',           'j')
 let g:NERDTreeMenuUp             = get(g:, 'NERDTreeMenuUp',             'k')
 "SECTION: Load class files{{{2
 call nerdtree#loadClassFiles()
@@ -169,11 +148,12 @@ call nerdtree#loadClassFiles()
 "============================================================
 call nerdtree#ui_glue#setupCommands()
 " SECTION: Auto commands {{{1
 "============================================================
 augroup NERDTree
    "Save the cursor position whenever we close the nerd tree
-    exec 'autocmd BufLeave,WinLeave '. g:NERDTreeCreator.BufNamePrefix() .'* if g:NERDTree.IsOpen() | call b:NERDTree.ui.saveScreenState() | endif'
+    exec 'autocmd BufLeave,WinLeave '. g:NERDTreeCreator.BufNamePrefix() .'* call nerdtree#onBufLeave()'
    "disallow insert mode in the NERDTree
    exec 'autocmd BufEnter,WinEnter '. g:NERDTreeCreator.BufNamePrefix() .'* stopinsert'
--- a/syntax/nerdtree.vim
+++ b/syntax/nerdtree.vim
@@ -22,13 +22,13 @@ syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
 "highlighting to conceal the delimiter around the file/dir name
 if has('conceal')
    exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# conceal containedin=ALL'
-    setlocal conceallevel=3 concealcursor=nvic
+    setlocal conceallevel=2 concealcursor=nvic
 else
    exec 'syn match NERDTreeNodeDelimiters #\%d' . char2nr(g:NERDTreeNodeDelimiter) . '# containedin=ALL'
    hi! link NERDTreeNodeDelimiters Ignore
 endif
-"highlighing for directory nodes and file nodes
+"highlighting for directory nodes and file nodes
 syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
 if g:NERDTreeDirArrowExpandable !=# ''
@@ -36,23 +36,23 @@ if g:NERDTreeDirArrowExpandable !=# ''
    exec 'syn match NERDTreeOpenable #' . escape(g:NERDTreeDirArrowExpandable, '~') . '\ze .*/# containedin=NERDTreeDir,NERDTreeFile'
    let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~]\-').escape(g:NERDTreeDirArrowExpandable, '~]\-')
    exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
-    exec 'syn match NERDTreeExecFile #^.*'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
+    exec 'syn match NERDTreeExecFile #^.*'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmarkName'
-    exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+    exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmarkName,NERDTreeExecFile'
 else
    exec 'syn match NERDTreeDir #[^'.g:NERDTreeNodeDelimiter.']\{-}/\ze\($\|'.g:NERDTreeNodeDelimiter.'\)#'
-    exec 'syn match NERDTreeExecFile #[^'.g:NERDTreeNodeDelimiter.']\{-}'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark'
+    exec 'syn match NERDTreeExecFile #[^'.g:NERDTreeNodeDelimiter.']\{-}'.g:NERDTreeNodeDelimiter.'\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmarkName'
-    exec 'syn match NERDTreeFile     #^.*'.g:NERDTreeNodeDelimiter.'.*[^\/]\($\|'.g:NERDTreeNodeDelimiter.'.*\)# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+    exec 'syn match NERDTreeFile     #^.*'.g:NERDTreeNodeDelimiter.'.*[^\/]\($\|'.g:NERDTreeNodeDelimiter.'.*\)# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmarkName,NERDTreeExecFile'
 endif
 "highlighting for readonly files
-exec 'syn match NERDTreeRO #.*'.g:NERDTreeNodeDelimiter.'\zs.*\ze'.g:NERDTreeNodeDelimiter.'.*\['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile'
+exec 'syn match NERDTreeRO #.*'.g:NERDTreeNodeDelimiter.'\zs.*\ze'.g:NERDTreeNodeDelimiter.'.*\['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmarkName,NERDTreeFile'
-exec 'syn match NERDTreeFlags #\[[^\]]*\]\ze'.g:NERDTreeNodeDelimiter.'# containedin=NERDTreeFile,NERDTreeExecFile,NERDTreeDir'
+exec 'syn match NERDTreeFlags #\[[^\]]*\]\ze'.g:NERDTreeNodeDelimiter.'# containedin=NERDTreeFile,NERDTreeExecFile,NERDTreeLinkFile,NERDTreeRO,NERDTreeDir'
 syn match NERDTreeCWD #^[</].*$#
 "highlighting for bookmarks
-syn match NERDTreeBookmark # {.*}#hs=s+1
+syn match NERDTreeBookmarkName # {.*}#hs=s+2,he=e-1
 "highlighting for the bookmarks table
 syn match NERDTreeBookmarksLeader #^>#
@@ -93,3 +93,5 @@ hi def link NERDTreeBookmark Statement
 hi def link NERDTreeFlags Number
 hi def link NERDTreeCurrentNode Search
 hi NERDTreeFile ctermbg=NONE guibg=NONE
Author	SHA1	Message	Date
rzvxa	62884a4005	refactor: rename `Path:isUnresolved` to `Path:isBroken`.	2024-05-13 15:33:47 +03:30
rzvxa	9eeacfd04b	feat: support for unresolved symlinks.	2024-05-13 14:46:15 +03:30
Ali Rezvani	6ad85ec29b	feat: jump to bookmark table shortcut. (#1394 ) Co-authored-by: Daniel Schreck <daniel.s.schreck@gmail.com>	2024-05-13 11:52:13 +03:30
Ali Rezvani	f3a4d8eaa8	chore: bump version to 7.1.2. (#1410 )	2024-02-27 15:20:59 +03:30
Ali Rezvani	bdf81a086d	fix: GetWinNum regex pattern. (#1409 )	2024-02-11 16:27:41 +03:30
Ali Rezvani	60b5e602e9	fix: session restore for nerdtree buffers. (#1405 )	2024-02-07 15:07:25 +03:30
Ali Rezvani	bc606c43e2	chore: bump version to 7.1.1 (#1401 )	2024-01-09 16:53:16 +03:30
Ali Rezvani	6acfc48d80	fix: change default binding of filelines to `FL`. (#1400 )	2024-01-09 15:55:55 +03:30
Ali Rezvani	aa29fbe481	fix: toggle zoom resizing (#1395 ) Co-authored-by: Daniel Schreck <daniel.s.schreck@gmail.com>	2024-01-01 06:37:44 +03:30
Ali Rezvani	e5599272a9	chore: bump version to 7.1.0 (#1391 )	2023-12-31 12:06:39 +03:30
Rocco Mao	ff9469a14a	fix: mapping description in NERDTree.txt (#1393 )	2023-12-26 04:38:17 +03:30
msibal6	fefea5d382	feat: add NERDTreeExplore command. (#1389 ) * create a explorer command that opens a window tree at specified directory * update CHANGELOG.md * Update CHANGELOG.md * revert CHANGELOG.md * CreateExplorerTree matches :Explore command * prevent empty split when calling NERDTreeExplorer with invalid arg from modified buffer * NERDTreeExplore/CreateExploreTree checks for hidden and autowriteall settings	2023-12-23 03:47:43 +03:30
Leo Chung	a954661824	fix: typo in nerdtree.txt (#1390 ) Signed-off-by: Leo Chung <gewalalb@gmail.com>	2023-12-20 18:55:39 +03:30
Ali Rezvani	9ec27d45a8	chore: Release version 7.0.1 (#1388 )	2023-12-02 18:57:37 +03:00
Ali Rezvani	50a394b2bf	fix: Make NERDTreeFind to handle directory case sensitivity (#1387 ) Co-authored-by: Dan Gibson <danial.gibson@spin.net.au>	2023-12-01 22:12:13 +03:00
Ali Rezvani	0cb04e9245	Show file lines (#1384 ) * Added showing lines of files in NERDTRee. * Added dynamic binding and documentation --------- Co-authored-by: Diallo Han <diallo@hpcnt.com>	2023-11-15 15:32:17 +03:30
Ali Rezvani	4c588f1820	Update GitHub PR template (#1383 )	2023-10-26 00:24:05 +03:30
Ali Rezvani	ff002d2132	Added case sensivity for refreshing nodes (#1382 )	2023-10-26 00:20:57 +03:30
Caleb Maclennan	79f6f912f4	chore: Drop over-urgent help wanted poster from readme Help is still welcome and the related issue still pinned, but we have an active contributer with some maintenence priviledges already. Having watched the issue for a while I don't think the 'throw your name in for consideration' is really helping because it attracts people who want the attention but aren't interested in actually jumping in and doing tho hard parts of maintaining a project. The glamorious bits are mostly done for this project and the long tail of issue triage and small bug fixes and improvements is long underway. Anyone is welcome to jump into those things, but advertising it as an opening is a) turning people off from using the plugin and b) attracting the wrong kind of applicants.	2023-10-24 22:59:42 +03:00
Ali Rezvani	edc9460859	Clarified the NERDTreeChangePermissions prompt (#1381 ) Co-authored-by: Caleb Maclennan <caleb@alerque.com>	2023-10-24 23:13:24 +03:30
Ali Rezvani	334542c361	Added reveal functionality for Windows platform in fs_menu (#1366 ) * Added reveal functionality for Windows platform * Removed an unnecessary check	2023-10-23 19:06:13 +03:30
Kai	9184ec05bd	fix: escape directories containing brackets([...]) for globbing (#1359 )	2023-10-22 17:58:09 +03:30
Ali Rezvani	ea4833da8a	Added Case Sensitive Move Operation via newly introduced flag `NERDTreeCaseSensitiveFS` (#1375 ) * Added NERDTreeCaseInsensitiveFS option. * check against g:NERDTreeCaseInsensitiveFS with path.equals method * Fixed issues in comments and added nerdtree#runningMac * Using nerdtree#runningMac instead of manual checks for mac * Better implementation * Updated documentation * Added notice about the flag * Updated the documentation * Added support for g:NERDTreeCaseSensitiveFS = 3 * Better comments * Exported caseSensitiveFS check as a function	2023-10-22 15:47:01 +03:30
Martin J. Klöckner	c99395a323	New menu command: Change selected node permissions (#1348 )	2023-10-19 16:03:38 +03:30
Bubu	d69b68bf31	Fix documentation error (#1372 )	2023-10-19 15:18:25 +03:30
SandeshPyakurel	3a66272486	Fixed typo in nerdtree.vim file (#1380 )	2023-10-19 13:24:52 +03:30
Ali Rezvani	b1f5bb60df	Updated CHANGELOG.md, bumped the version to 7.0.0 (#1379 )	2023-10-19 12:28:11 +03:30
rzvxa	32168889bd	Warn about invalid files not loaded on-refresh	2023-09-04 17:41:47 -06:00
Rafael Monico	aedd0653ad	Warn about invalid files not loaded on-load Co-authored-by: rzvxa <rzvxa@protonmail.com>	2023-09-04 17:41:47 -06:00
Ali Rezvani	1f2e28d476	Add horizontal position options to `g:NERDTreeWinPos` (#1363 )	2023-09-03 06:45:35 +03:00
Nick Jensen	6895e5259e	Fix README autocmd suggestion (#1330 )	2023-09-03 06:29:01 +03:00
Caleb Maclennan	c46e12a886	ci: Update vimscript linter workflow with latest GH Action	2023-06-21 10:30:25 +03:00
Rod Elias	fc85a6f07c	Fix typo in docs (#1306 )	2022-06-13 13:10:46 +03:00
Phil Runninger	eed488b1cd	Help Wanted Announcement	2021-10-29 00:16:03 -04:00
lifecrisis	9310f91476	Fix documentation errors (#1269 ) * Fix a typo: "NERDTree_" -> "NERD_Tree_" * Format text * Use the proper abbreviation for the BEL character * Format text * Make the documentation match the code The syntax file sets 'conceallevel' to 2, not 3. * Update the "CHANGELOG.md" file	2021-09-27 20:43:04 -04:00
lifecrisis	e731b84559	Ensure backward compatible testing of types (#1266 ) - Use "type(0)" instead of "v:t_number" - Use "==" instead of "==#" since we are comparing numbers - Make use of the "+=" operator - Update the "CHANGELOG.md" file The only real issue here is that we should prefer "type(0)" over the special variable. I run into this problem enough on older systems that it frustrates me. Let's have it fixed!	2021-09-20 15:01:21 -04:00
Phil Runninger	7eee457efa	Replace trim() with a version-compatible alternative. (#1265 ) * Replace trim() with a version-compatible alternative. * Update version number in change log.	2021-09-14 22:34:57 -04:00
Phil Runninger	aa7e97b7ff	Change highlighting of bookmarks in the tree. (#1261 ) * Change highlighting of bookmarks in the tree. The bookmark names in the tree now have the same syntax highlighting as the bookmark names in the list of bookmarks above the tree. * Change version number in change log.	2021-09-11 11:31:39 -04:00
Phil Runninger	e5f24e2b8b	Answer the question about accessing files over scp or ftp. (#1259 ) * Answer the question about accessing files over scp or ftp. * Minor formatting change to README. * Update version number in Change Log.	2021-09-07 10:14:36 -04:00
Sharla Kew	0e71462f90	Trim filenames created via the fs_menu (#1243 ) The default when naming a file in the command line is that extra white space will be stripped away. It seems logical for file naming via the fs_menu in nerdtree to follow that convention. I have left the defaults of `trim` because they seem sensible. Co-authored-by: Phil Runninger <PhilRunninger@users.noreply.github.com>	2021-08-12 19:18:53 -04:00
Phil Runninger	2c14ed0e15	Update Wiki link in General Question issue template	2021-07-15 08:31:01 -04:00
Phil Runninger	de0e2edeac	Improve F.A.Q. Answers and Issue Templates (#1249 ) * Update the issue templates, making them simpler to use. * Update FAQ answers. Closes #1246. - Add an if statement to the autocommand to prevent its running in the Command Window. Closes #1248. - Add a new answer to show closing a tab when only NERDTree remains. * Update the Bug issue template. * Update version number in change log.	2021-07-13 14:28:29 -04:00
Phil Runninger	81f3eaba29	`go` on a bookmark directory will NERDTreeFind it. (#1236 ) * `go` on a bookmark directory will NERDTreeFind it. This leaves the root unchanged if possible. * Update version number in change log.	2021-03-24 23:41:15 -04:00
Phil Runninger	f63fb6984f	Put `Callback` function variables in local scope. (#1230 ) * Put `Callback` function variables in local scope. This change prevents conflict with other `Callback` functions that are defined elsewhere in global scope. * Update version number in change log.	2021-03-01 09:34:54 -05:00
Phil Runninger	a1fa4a33bf	Fix mouse-clicking a file to open it, which was broken in 6.10.5. (#1225 ) * Fix mouse-clicking a file to open it, which was broken in 6.10.5. * Update version number in change log.	2021-02-12 23:14:26 -05:00
Phil Runninger	3a9d533f3d	Restore the default behavior of the <CR> key. (#1221 ) * Restore <CR>'s default behavior to be the same as o's. * Remove the dictionary validation, and simplify initCustomOpenArgs(). There was a bug in the validation logic that caused a valid integer value of 'keepopen' to always be overwritten with the defaultOpenArgs' value. It was always comparing its type to the type of a string. I fixed this by removing all the type validation, and wrapping the code with a try-catch block. If NERDTreeCustomOpenArgs is not a dictionary, an error message will print and the defaults will be used instead. * Add fold markers to new functions. * Update version number in change log.	2021-02-10 22:20:04 -05:00
Phil Runninger	d3f9fc44ca	Update README.markdown Add the missing slashes in the names of two of the mentioned plugin managers.	2021-02-10 16:38:41 -05:00
Phil Runninger	1d46d6df3e	Update README.markdown	2021-02-09 21:50:35 -05:00
Phil Runninger	593c16add3	Fix {'keepopen':0} in NERDTreeCustomOpenArgs (#1217 ) * Replace #and() with two more-specific functions. * Push NERDTreeQuitOnOpen checking earlier in the call stack. * Fix bug in `go` key for file bookmarks. It was behaving like `gs`. * Fix the `o` mapping for bookmark nodes and the g:NERDTree reference. * Use get() function to shorten if statement logic. * Update version number in change log. * Remove obsolete reference to MERDTreeQuitOnOpen in comment.	2021-02-09 21:34:24 -05:00
Daniel E	d3becd1149	Removed directory separator from sort key (#1219 ) * Removed directory separator from sort key Directories had an additional separator appended to them which caused improper comparisons for other directories that shared similar prefixes. * Updated changelog	2021-02-09 20:48:36 -05:00
Phil Runninger	1b19089917	Add new FAQ and answer: How to prevent buffers replacing NERDTree. (#1215 ) * Add new FAQ and answer: How to prevent buffers replacing NERDTree. * Update version number in change log.	2021-01-31 00:19:58 -05:00
Phil Runninger	c8be9458dd	New menu command: Run a system command in this directory. (#1214 ) * New menu command: Run system command in this directory. * Echo the output from the system command. * Update version number in change log. * Address Vim linter message: change "\n" to nr2char(10) * Use single quoted strings. * Use system() instead of systemlist() for greater version compatibility. systemlist() was introduced sometime in Vim 8+, so I switched to system() for 7.4 compatibility.	2021-01-30 23:45:56 -05:00
Phil Runninger	628098fff1	Escape quotation marks so they can be used in key mappings. (#1213 ) * Escape quotation marks so they can be used in key mappings. * Update version number in change log.	2021-01-30 23:43:29 -05:00
Phil Runninger	b134f6518b	Enable full path specifications for NERDTreeIgnore (#1207 ) * Add ability to specify a path to be ignored. This ignore expression compares itself against the whole path of the node, instead of just the tail component of the node. * Remove debug statements and make it work on Windows. * Restore the original self.str() to get OS-specific paths for comparing. Using the UI-formatted path had two problems. 1. It always appended a forward slash at the end of the path, which was unnecessary and made patterns like '/tmp/cache$[[path]]' not work as expected. 2. It always used forward slashes to join the path components. I thought this would be a good thing, but there's no reason to force Windows users to use that syntax. They'll just need to remember to escape the backslashes, like so: '\\Temp\\cache$[[path]]' * Add documentation for the new [[path]] tag for NERDTreeIgnore. * Replace the abbreviation 'dir' with the full word 'directory'. * Update version number in change log.	2021-01-19 20:07:26 -05:00
Tomasz N	7099f638ed	Fix missing key case, add BC type checking (#1206 ) * Fix missing key case, add BC type checking Resolves #1205 * Assign g:NERDTreeCustomOpenArgs also before quick return * Fix syntax to be compatibile with Vim 7.3	2021-01-18 21:23:52 -05:00
Phil Runninger	a7eb011e47	Revert #1200 , due to bug (#1205 ) it introduced.	2021-01-17 22:16:38 -05:00
Tomasz N	7e1713853a	Respect NERDTreeCustomOpenArgs when opening bookmark (#1200 ) * Respect NERDTreeCustomOpenArgs when opening bookmark * Update CHANGELOG * Do not duplicate s:initCustomOpenArgs() * Restore missing assignment * fixup! Restore missing assignment * fixup! Do not duplicate s:initCustomOpenArgs() * Simplify loop iteration	2021-01-17 20:00:17 -05:00
Phil Runninger	aaa946fb6b	Provide alternate way to mirror the NERDTree on all tabs.	2020-12-19 20:28:15 -05:00
Phil Runninger	2406c456ee	Revamp the README file (#1193 ) * Revamp the README to improve clarity and provide more information. * Verify correct behavior of suggested auto commands. * Add my tribute to Norm Abrams. Be careful with those plugin managers. * Other minor formatting and cleanup. * Fix typos, reorder some sections, and tidy up the README. * Give a better answer to the single NERDTree for all tabs question. * More reformatting of text. * Add basic installation instructions. Switch to single quotes. * Update version number in CHANGELOG.	2020-12-18 15:03:38 -05:00
buncis	474d735b7d	readme update add script for automatically open NERDTree and focus on file (#1192 ) * update readme for auto startup NERDTree and focus on file * readme update add how to open NERDTree automatically and focus on file	2020-12-18 00:36:10 -05:00
Phil Runninger	14af89743a	Open a mirrored NERDTree with correct width (#1177 ) * Make sure a mirrored NERDTree is displayed at correct width. * Remove references to unused variables. b:NERDTreeOldWindowSize was referenced, but never set anywhere. No need to keep it around. * Refactor: Initialize variables a different way. Using the get() function allows us to "let" variables more directly, without using the execute command or requiring strings to be escaped. This also eliminates the s:initVariable function. The new format is shown below, and defines a default value if the user didn't provide a value in the vimrc file. let g:var = get(g: 'var', 'default value') * Update version number in change log. * Fix alignment of `let g:var = get(g:, 'var', <default>)` statements.	2020-10-14 18:08:18 -04:00
Yosef Herskovitz	577ddc73f0	Updated Readme (#1167 ) * Updated Readme Fixed typo in readme * Updated Changelog	2020-08-18 11:14:05 -04:00
Phil Runninger	23000acd7f	Refactor sort comparison functions, removing redundancy (#1166 ) * Add a function to compare path objects. * Remove redundant node comparison function, and rename the ones left. * Remove the compareTo function in the Path object. Use nerdtree#compareNodePaths(p1,p2) instead. There was no need for two comparison functions that do the same thing. They were a little different in their details, but that shouldn't be the case. Having only one such function makes better sense and is easier to maintain. * Update version number in change log.	2020-08-14 18:06:03 -04:00
Phil Runninger	6b5d70e5bf	Fix argument of exists() function calls checking for autocommands. (#1165 ) * Fix syntax of exists function calls checking for autocommands. * Update version number in change log.	2020-08-09 07:07:55 -04:00
Phil Runninger	373a4b28e4	Don't use silent when raising User events (#1164 ) * Remove silent from doautocmd. Prevent errors with exists('#...'). * Update version number in change log.	2020-08-07 00:37:56 -04:00
Yeri Pratama	4a32dd0be3	fix highlight for file node (#1157 ) * fix #960 953 highlight for file node * update changelog	2020-07-24 11:14:54 -04:00
Phil Runninger	e571d3e95b	Make sure symbolic links' flags are highlighted correctly. (#1156 ) * Make sure symbolic links' flags are higlighted correctly. * Update version number in change log.	2020-07-17 14:11:08 -04:00
Phil Runninger	96e247ba74	Respect user's &shellslash setting in CopyNode and RemoveNode functions (#1150 ) * Replace s:Path.Slash() with nerdtree#slash(). * Check the value of &shell when determining the slash under Windows. * Leave &shellslash unchanged when forming copy/delete commands. * Fix fold marker. * Update version number in change log. * Add abort attribute to nerdtree#slash() to satisfy Vim style guide. Co-authored-by: Phil Runninger <prunninger@vhtcx.com>	2020-07-14 08:53:00 -04:00
Phil Runninger	2af10e3589	Update PULL_REQUEST_TEMPLATE.md Use a shorter command to display the recent patches: replace `\| head -2` with `-m2` grep switch; replace a `sed` with `cut` to get the line numbers.	2020-07-14 08:49:44 -04:00
Phil Runninger	42a5a2c106	Update PULL_REQUEST_TEMPLATE.md Make the tag creation process semi-automatic by making bash do more of the legwork. The included bash commands will: 1. Make sure your master branch is up to date 2. Display all the patch releases in the current MAJOR.MINOR version 3. Ask for a version number to use as the tag (one of the ones previously displayed, presumably) 4. Get the latest commit's subject line, and use it in the tag's message field. 5. Create the tag, and push all tags to the origin.	2020-07-14 08:32:29 -04:00
Phil Runninger	f8aa749985	Fix new NERDTrees' width when previous one was in the only window. (#1153 ) * Fix new NERDTrees' width when previous one was in the only window. When leaving a NERDTree buffer, its window's width is remembered so that that width can be used when showing the buffer again in a new window. If NERDTree is the only window when leaving the buffer, it remembers the whole width of the editor. When a new NERDTree window is created, it is sized such that there is only a very small window for files to be opened into. To fix this, if NERDTree is the ONLY window, remember its width as the value of g:NERDTreeWinSize, not the width of the editor. * Update version number in change log.	2020-07-14 07:20:48 -04:00
Phil Runninger	aa37cb40da	Fix the scope of several key mappings (#1151 ) * Limit opening or previewing into a split window to only file nodes. * Prevent previwing directory nodes, which would create another NERDTree. * Refactor the previewBookmark code to open directories a better way. * Update version number in change log. * Update documentation.	2020-07-12 10:03:24 -04:00
Phil Runninger	6571452857	Enable opening bookmarks in split windows. (#1144 ) * Add open/preview in split/vsplit to bookmarks. * Make preview split/vsplit bookmark work only on file nodes. * Add quickhelp text for split/vsplit commands on bookmarks. * Handle previewing directory bookmarks properly. * Update documentation: bookmarks can be opened in a split/vsplit. * Update version number in change log.	2020-06-23 10:40:30 -04:00
Phil Runninger	d48ab70721	Merge branch 'master' of github.com:preservim/nerdtree	2020-06-01 02:09:39 -04:00
Phil Runninger	9de5b3e785	Allow concealed characters to show another character. (#1138 ) * Closes #1136. Allow concealed characters to show another character. conceallevel=3 always hides the character, but conceallevel=2 allows an alternate character to be displayed instead. * Update version number in changelog.	2020-06-01 02:08:13 -04:00
Phil Runninger	635071dcc8	Closes #1136 . Allow concealed characters to show another character. conceallevel=3 always hides the character, but conceallevel=2 allows an alternate character to be displayed instead.	2020-06-01 01:51:27 -04:00