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

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
Conflicts:
	sources_non_forked/ale/autoload/ale.vim
	sources_non_forked/lightline.vim/doc/lightline.txt
	sources_non_forked/nerdtree/autoload/nerdtree.vim
	sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim
	sources_non_forked/vim-fugitive/autoload/fugitive.vim
	sources_non_forked/vim-fugitive/doc/fugitive.txt
This commit is contained in:
geezuslucifer@gmail.com
2021-06-30 14:46:47 -05:00
parent 1cca3b1df2 597b7acdc0
commit 7d3bd53d7c
6 changed files with 214 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ endfunction
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
function! nerdtree#slash()
=======
"FUNCTION: nerdtree#slash() {{{2
@ -57,6 +58,8 @@ function! nerdtree#slash() abort
=======
=======
=======
>>>>>>> master
" FUNCTION: nerdtree#closeTreeOnOpen() {{{2
function! nerdtree#closeTreeOnOpen() abort
return g:NERDTreeQuitOnOpen == 1 || g:NERDTreeQuitOnOpen == 3
@ -67,7 +70,10 @@ function! nerdtree#closeBookmarksOnOpen() abort
return g:NERDTreeQuitOnOpen == 2 || g:NERDTreeQuitOnOpen == 3
endfunction
<<<<<<< HEAD
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
=======
>>>>>>> master
" 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

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

@ -131,6 +131,7 @@ endfunction
"FUNCTION: s:initCustomOpenArgs() {{{1
<<<<<<< HEAD
<<<<<<< HEAD
" Make sure NERDTreeCustomOpenArgs has needed keys
<<<<<<< HEAD
function! s:initCustomOpenArgs()
@ -141,6 +142,9 @@ function! s:initCustomOpenArgs() abort
return extend(g:NERDTreeCustomOpenArgs, {'file':{'reuse': 'all', 'where': 'p'}, 'dir':{}}, 'keep')
=======
function! s:initCustomOpenArgs() abort
=======
function! s:initCustomOpenArgs() abort
>>>>>>> master
let l:defaultOpenArgs = {'file': {'reuse': 'all', 'where': 'p', 'keepopen':!nerdtree#closeTreeOnOpen()}, 'dir': {}}
try
let g:NERDTreeCustomOpenArgs = get(g:, 'NERDTreeCustomOpenArgs', {})
@ -151,7 +155,10 @@ function! s:initCustomOpenArgs() abort
finally
return g:NERDTreeCustomOpenArgs
endtry
<<<<<<< HEAD
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
=======
>>>>>>> master
endfunction
"FUNCTION: s:activateAll() {{{1