kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16420 from seandewar/vim-8.1.2136

Browse Source 
vim-patch:8.1.2136,8.2.2465
This commit is contained in:
Jan Edmund Lazo 2021-11-30 21:39:22 -05:00 committed by GitHub
commit 2635b77dba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/search.c
View File

@ -5248,6 +5248,9 @@ search_line:
if (depth == -1) { if (depth == -1) {
// match in current file // match in current file
if (l_g_do_tagpreview != 0) { if (l_g_do_tagpreview != 0) {
if (!win_valid(curwin_save)) {
break;
}
if (!GETFILE_SUCCESS(getfile(curwin_save->w_buffer->b_fnum, NULL, if (!GETFILE_SUCCESS(getfile(curwin_save->w_buffer->b_fnum, NULL,
NULL, true, lnum, false))) { NULL, true, lnum, false))) {
break; // failed to jump to file break; // failed to jump to file

35
src/nvim/testdir/test_autocmd.vim
View File

@ -33,7 +33,7 @@ if has('timers')
let g:triggered = 0 let g:triggered = 0
au CursorHoldI * let g:triggered += 1 au CursorHoldI * let g:triggered += 1
set updatetime=20 set updatetime=20
call timer_start(LoadAdjust(100), 'ExitInsertMode') call timer_start(LoadAdjust(200), 'ExitInsertMode')
call feedkeys('a', 'x!') call feedkeys('a', 'x!')
call assert_equal(1, g:triggered) call assert_equal(1, g:triggered)
unlet g:triggered unlet g:triggered
@ -1897,6 +1897,26 @@ func Test_autocmd_CmdWinEnter()
call delete(filename) call delete(filename)
endfunc endfunc
func Test_autocmd_was_using_freed_memory()
pedit xx
n x
augroup winenter
au WinEnter * if winnr('$') > 2 | quit | endif
augroup END
" Nvim needs large 'winwidth' and 'nowinfixwidth' to crash
set winwidth=99999 nowinfixwidth
split
augroup winenter
au! WinEnter
augroup END
set winwidth& winfixwidth&
bwipe xx
bwipe x
pclose
endfunc
func Test_FileChangedShell_reload() func Test_FileChangedShell_reload()
if !has('unix') if !has('unix')
return return
@ -2125,6 +2145,19 @@ func Test_autocmd_closes_window()
au! BufWinLeave au! BufWinLeave
endfunc endfunc
func Test_autocmd_quit_psearch()
sn aa bb
augroup aucmd_win_test
au!
au BufEnter,BufLeave,BufNew,WinEnter,WinLeave,WinNew * if winnr('$') > 1 | q | endif
augroup END
ps /
augroup aucmd_win_test
au!
augroup END
endfunc
func Test_autocmd_closing_cmdwin() func Test_autocmd_closing_cmdwin()
au BufWinLeave * nested q au BufWinLeave * nested q
call assert_fails("norm 7q?\n", 'E855:') call assert_fails("norm 7q?\n", 'E855:')

3
src/nvim/window.c
View File

@ -4525,6 +4525,7 @@ static void win_enter_ext(win_T *const wp, const int flags)
fix_current_dir(); fix_current_dir();
// Careful: autocommands may close the window and make "wp" invalid
if (flags & WEE_TRIGGER_NEW_AUTOCMDS) { if (flags & WEE_TRIGGER_NEW_AUTOCMDS) {
apply_autocmds(EVENT_WINNEW, NULL, NULL, false, curbuf); apply_autocmds(EVENT_WINNEW, NULL, NULL, false, curbuf);
} }
@ -4558,7 +4559,7 @@ static void win_enter_ext(win_T *const wp, const int flags)
} }
// set window width to desired minimal value // set window width to desired minimal value
if (curwin->w_width < p_wiw && !curwin->w_p_wfw && !wp->w_floating) { if (curwin->w_width < p_wiw && !curwin->w_p_wfw && !curwin->w_floating) {
win_setwidth((int)p_wiw); win_setwidth((int)p_wiw);
} }