commit 1cbd52aa77541682658f4c8a6d217c77a78c3879
parent cd5f1685bcb096577ee98f9ff0f73e101b15a1aa
Author: Martin Grenfell <martin.grenfell@gmail.com>
Date: Fri, 1 May 2015 14:13:13 +0100
Merge pull request #434 from handcraftedbits/master
Use different arrow characters for compatibility.
Diffstat:
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/autoload/nerdtree.vim b/autoload/nerdtree.vim
@@ -98,7 +98,7 @@ endfunction
"FUNCTION: nerdtree#treeMarkupReg(dir) {{{2
function! nerdtree#treeMarkupReg()
if g:NERDTreeDirArrows
- return '^\([▾▸] \| \+[▾▸] \| \+\)'
+ return '^\([▼▶] \| \+[▼▶] \| \+\)'
endif
return '^[ `|]*[\-+~]'
diff --git a/lib/nerdtree/tree_file_node.vim b/lib/nerdtree/tree_file_node.vim
@@ -383,13 +383,13 @@ function! s:TreeFileNode._renderToString(depth, drawText, vertMap, isLastChild)
if self.path.isDirectory
if self.isOpen
if g:NERDTreeDirArrows
- let treeParts = treeParts . '▾ '
+ let treeParts = treeParts . '▼ '
else
let treeParts = treeParts . '~'
endif
else
if g:NERDTreeDirArrows
- let treeParts = treeParts . '▸ '
+ let treeParts = treeParts . '▶ '
else
let treeParts = treeParts . '+'
endif
diff --git a/lib/nerdtree/ui.vim b/lib/nerdtree/ui.vim
@@ -51,7 +51,7 @@ function! s:UI.getPath(ln)
if !g:NERDTreeDirArrows
" in case called from outside the tree
- if line !~# '^ *[|`▸▾ ]' || line =~# '^$'
+ if line !~# '^ *[|`▶▼ ]' || line =~# '^$'
return {}
endif
endif
@@ -159,9 +159,9 @@ endfunction
"FUNCTION: s:UI._indentLevelFor(line) {{{2
function! s:UI._indentLevelFor(line)
- let level = match(a:line, '[^ \-+~▸▾`|]') / nerdtree#treeWid()
+ let level = match(a:line, '[^ \-+~▶▼`|]') / nerdtree#treeWid()
" check if line includes arrows
- if match(a:line, '[▸▾]') > -1
+ if match(a:line, '[▶▼]') > -1
" decrement level as arrow uses 3 ascii chars
let level = level - 1
endif
diff --git a/syntax/nerdtree.vim b/syntax/nerdtree.vim
@@ -23,12 +23,12 @@ syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
if g:NERDTreeDirArrows
- syn match NERDTreeClosable #▾# containedin=NERDTreeDir,NERDTreeFile
- syn match NERDTreeOpenable #▸# containedin=NERDTreeDir,NERDTreeFile
+ syn match NERDTreeClosable #▼# containedin=NERDTreeDir,NERDTreeFile
+ syn match NERDTreeOpenable #▶# containedin=NERDTreeDir,NERDTreeFile
- syn match NERDTreeDir #[^▾▸ ].*/#
+ syn match NERDTreeDir #[^▼▶ ].*/#
syn match NERDTreeExecFile #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
- syn match NERDTreeFile #^[^"\.▾▸] *[^▾▸]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
+ syn match NERDTreeFile #^[^"\.▼▶] *[^▼▶]*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile
"highlighting for readonly files
syn match NERDTreeRO # *\zs.*\ze \[RO\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile