ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-09-19 19:25:00 +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 13:19:18 -05:00
parent 3afe70fe5a 1cca3b1df2
commit 29a3a22f6a
235 changed files with 6246 additions and 1351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ endfunction
" SECTION: General Functions {{{1
"============================================================
<<<<<<< HEAD
" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
function! nerdtree#closeTreeOnOpen() abort
return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
@ -40,6 +41,30 @@ function! nerdtree#closeBookmarksOnOpen() abort
return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
endfunction
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
function! nerdtree#slash()
=======
"FUNCTION: nerdtree#slash() {{{2
function! nerdtree#slash() abort
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
=======
=======
" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
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
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
" 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

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

@ -108,7 +108,21 @@ function! s:customOpenBookmark(node) abort
endfunction
"FUNCTION: s:initCustomOpenArgs() {{{1
<<<<<<< HEAD
function! s:initCustomOpenArgs() abort
=======
<<<<<<< HEAD
" Make sure NERDTreeCustomOpenArgs has needed keys
<<<<<<< HEAD
function! s:initCustomOpenArgs()
=======
function! s:initCustomOpenArgs() abort
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
=======
function! s:initCustomOpenArgs() abort
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
try
let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
@ -119,6 +133,10 @@ function! s:initCustomOpenArgs() abort
finally
return g:NERDTreeCustomOpenArgs
endtry
<<<<<<< HEAD
=======
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
endfunction
"FUNCTION: s:activateAll() {{{1
@ -572,7 +590,15 @@ endfunction
" FUNCTION: s:previewBookmark(bookmark) {{{1
function! s:previewBookmark(bookmark) abort
<<<<<<< HEAD
call a:bookmark.activate(b:NERDTree, !a:bookmark.path.isDirectory ? {'stay': 1, 'where': 'p', 'keepopen': 1} : {})
=======
if a:bookmark.path.isDirectory
execute 'NERDTreeFind '.a:bookmark.path.str()
else
call a:bookmark.activate(b:NERDTree, {'stay': 1, 'where': 'p', 'keepopen': 1})
endif
>>>>>>> 1cca3b1df2973096bb9526a0d79c7b93c04e66b3
endfunction
"FUNCTION: s:previewNodeCurrent(node) {{{1