ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-09 02:25:00 +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/.github/PULL_REQUEST_TEMPLATE.md
	sources_non_forked/nerdtree/autoload/nerdtree.vim
	sources_non_forked/nerdtree/plugin/NERD_tree.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-02-19 08:50:18 -06:00
parent f2c3cff101 f6855c3c41
commit 43c7efba8d
352 changed files with 11973 additions and 4879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sources_non_forked/vim-snipmate/Contributors.md
View File

@ -48,5 +48,6 @@ additional contributions from:
* [steveno](https://github.com/steveno)
* [taq](https://github.com/taq)
* [thisgeek](https://github.com/thisgeek)
* [tomushkin](https://github.com/tomushkin)
* [trusktr](https://github.com/trusktr)
* [Xandaros](https://github.com/Xandaros)

2
sources_non_forked/vim-snipmate/autoload/snipMate.vim
View File

@ -42,7 +42,7 @@ function! snipMate#expandSnip(snip, version, col) abort
" Open any folds snippet expands into
if &foldenable
silent! exec lnum . ',' . (lnum + len(snipLines) - 1) . 'foldopen'
silent! exec lnum . 'foldopen!'
endif
aug snipmate_changes

2
sources_non_forked/vim-snipmate/autoload/snipmate/parse.vim
View File

@ -182,7 +182,7 @@ function! s:parser_text(till) dict abort
if var[0] is# 'VISUAL'
let lines = s:visual_placeholder(var, self.indent)
" Remove trailing newline. See #245
if lines[-1] == '' && self.next == "\n"
if lines[-1] =~ '^\s*$' && self.next == "\n"
call remove(lines, -1)
endif
elseif var[0] >= 0