ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-14 15:34:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Linux' of https://github.com/Geezus42/vimrc into Linux

Browse Source
This commit is contained in:
geezus
2021-06-30 14:59:46 -05:00
parent 29a3a22f6a 7d3bd53d7c
commit 9191883819
6 changed files with 306 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sources_non_forked/nerdtree/autoload/nerdtree.vim
View File

@ -45,6 +45,7 @@ endfunction
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
function! nerdtree#slash()
=======
"FUNCTION: nerdtree#slash() {{{2
@ -53,6 +54,8 @@ function! nerdtree#slash() abort
=======
=======
=======
>>>>>>> master
" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
function! nerdtree#closeTreeOnOpen() abort
return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
@ -63,8 +66,14 @@ function! nerdtree#closeBookmarksOnOpen() abort
return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
endfunction
<<<<<<< HEAD
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
<<<<<<< HEAD
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
=======
=======
>>>>>>> master
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
" 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

15
sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
View File

@ -109,8 +109,11 @@ endfunction
"FUNCTION: s:initCustomOpenArgs() {{{1
<<<<<<< HEAD
<<<<<<< HEAD
function! s:initCustomOpenArgs() abort
=======
=======
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
<<<<<<< HEAD
" Make sure NERDTreeCustomOpenArgs has needed keys
<<<<<<< HEAD
@ -122,7 +125,13 @@ function! s:initCustomOpenArgs() abort
return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
=======
function! s:initCustomOpenArgs() abort
<<<<<<< HEAD
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
=======
=======
function! s:initCustomOpenArgs() abort
>>>>>>> master
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
try
let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
@ -134,9 +143,15 @@ function! s:initCustomOpenArgs() abort
return g:NERDTreeCustomOpenArgs
endtry
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
=======
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
=======
>>>>>>> master
>>>>>>> 7d3bd53d7cd0030a6e49a53fb897514d78de3437
endfunction
"FUNCTION: s:activateAll() {{{1