Merge branch 'master' of github.com:preservim/nerdtree

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.
2025-11-08 19:33:50 -05:00 · 2020-06-01 02:09:39 -04:00 · 2020-06-01 02:08:13 -04:00 · 2020-06-01 01:51:27 -04:00 · 2020-05-26 00:15:17 -04:00 · 2020-05-25 11:33:20 -04:00
5 changed files with 8 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@
     version in an unordered list.  The format is:
        - **.PATCH**: Pull Request Title (PR Author) [PR Number](Link to PR)
 -->
+#### 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)
 - **.13**: `cmd.exe /c start "" <filename>` for windows default viewer support. (J. Altayó) [#1130](https://github.com/preservim/nerdtree/pull/1130)
 - **.12**: Fixed a bug that caused the file-tree construction to slow down significantly. (Eugenij-W) [#1126](https://github.com/preservim/nerdtree/pull/1126)
 - **.11**: Fix exception in NERDTreeFind (on windows OS and If the file is located in the root directory of the disk) (Eugenij-W) [#1122](https://github.com/preservim/nerdtree/pull/1122)
--- a/autoload/nerdtree.vim
+++ b/autoload/nerdtree.vim
@@ -45,7 +45,7 @@ function! nerdtree#slash() abort
 endfunction

 "FUNCTION: nerdtree#and(x,y) {{{2
-" Implements and() function for Vim <= 7.2
+" Implements and() function for Vim <= 7.4
 function! nerdtree#and(x,y) abort
    if exists('*and')
        return and(a:x, a:y)
--- a/lib/nerdtree/opener.vim
+++ b/lib/nerdtree/opener.vim
@@ -219,7 +219,7 @@ endfunction

 " FUNCTION: Opener._openFile() {{{1
 function! s:Opener._openFile()
-    if !self._stay && !and(g:NERDTreeQuitOnOpen,1) && exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
+    if !self._stay && !nerdtree#and(g:NERDTreeQuitOnOpen,1) && exists('b:NERDTreeZoomed') && b:NERDTreeZoomed
        call b:NERDTree.ui.toggleZoom()
    endif

--- a/lib/nerdtree/path.vim
+++ b/lib/nerdtree/path.vim
@@ -332,7 +332,7 @@ function! s:Path._escChars()
        return " `\|\"#%&,?()\*^<>$"
    endif

-    return " \\`\|\"#%&,?()\*^<>[]$"
+    return " \\`\|\"#%&,?()\*^<>[]{}$"
 endfunction

 " FUNCTION: Path.getDir() {{{1
--- a/syntax/nerdtree.vim
+++ b/syntax/nerdtree.vim
@@ -22,7 +22,7 @@ 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
Author	SHA1	Message	Date
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
Phil Runninger	052b1f00a0	Add curly braces to the list of characters to be escaped. (#1128 ) * Add curly braces to the list of characters to be escaped. * Update version number in change log.	2020-05-26 00:15:17 -04:00
Phil Runninger	f63132cade	Use backward-compatible nerdtree#and() in one place that was missed. (#1134 ) * Use backward-compatible nerdtree#and() in one place that was missed. * Update version number in change log.	2020-05-25 11:33:20 -04:00