Merge pull request #14282 from janlazo/vim-8.2.2695

vim-patch:8.2.{2695,2697,2700,2701,2702}
This commit is contained in:
Jan Edmund Lazo
2021-04-03 21:09:26 -04:00
committed by GitHub
3 changed files with 13 additions and 4 deletions

View File

@@ -958,6 +958,7 @@ Testing: *test-functions*
assert_true() assert that an expression is true
assert_exception() assert that a command throws an exception
assert_beeps() assert that a command beeps
assert_nobeep() assert that a command does not cause a beep
assert_fails() assert that a command fails
Timers: *timer-functions*

View File

@@ -1621,13 +1621,21 @@ static bool apply_autocmds_group(event_T event,
ap->last = false;
}
ap->last = true;
check_lnums(true); // make sure cursor and topline are valid
if (nesting == 1) {
// make sure cursor and topline are valid
check_lnums(true);
}
// Execute the autocmd. The `getnextac` callback handles iteration.
do_cmdline(NULL, getnextac, (void *)&patcmd,
DOCMD_NOWAIT | DOCMD_VERBOSE | DOCMD_REPEAT);
reset_lnums(); // restore cursor and topline, unless they were changed
if (nesting == 1) {
// restore cursor and topline, unless they were changed
reset_lnums();
}
if (eap != NULL) {
(void)set_cmdarg(NULL, save_cmdarg);

View File

@@ -60,10 +60,10 @@ func Test_compiler_completion()
call assert_match('^"compiler ' .. clist .. '$', @:)
call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"compiler pbx perl php pylint pyunit', @:)
call assert_match('"compiler pbx perl\( p[a-z]\+\)\+ pylint pyunit', @:)
call feedkeys(":compiler! p\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"compiler! pbx perl php pylint pyunit', @:)
call assert_match('"compiler! pbx perl\( p[a-z]\+\)\+ pylint pyunit', @:)
endfunc
func Test_compiler_error()