mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Revert "vim-patch:8.0.0133 (#7107)"
This reverts commit eb40b7ec40
.
The change caused this error on QuickBuild:
INFO - # test/functional/core/job_spec.lua @ 668: pty process teardown does not prevent/delay exit. #4798 #4900
INFO - not ok 321 - pty process teardown does not prevent/delay exit. #4798 #4900
INFO - # test/functional/core/job_spec.lua @ 668
INFO - # Failure message: ./test/functional/ui/screen.lua:302: Row 1 did not match.
INFO - # Expected:
INFO - # |* |
INFO - # |[Process exited 0] |
INFO - # | |
INFO - # | |
INFO - # | |
INFO - # |-- TERMINAL -- |
INFO - # Actual:
INFO - # |*E575: Error while reading ShaD|
INFO - # |a file: mark entry at position|
INFO - # | 92 has invalid line number |
INFO - # |Press ENTER or type command to|
INFO - # | continue |
INFO - # |-- TERMINAL -- |
INFO - #
INFO - # To print the expect() call that would assert the current screen state, use
INFO - # screen:snaphot_util(). In case of non-deterministic failures, use
INFO - # screen:redraw_debug() to show all intermediate screen states.
INFO - # stack traceback:
INFO - # ./test/functional/ui/screen.lua:302: in function 'wait'
INFO - # ./test/functional/ui/screen.lua:216: in function 'expect'
INFO - # test/functional/core/job_spec.lua:677: in function <test/functional/core/job_spec.lua:668>
This commit is contained in:
parent
eb40b7ec40
commit
8160a0e042
@ -1665,15 +1665,11 @@ static char_u * do_one_cmd(char_u **cmdlinep,
|
|||||||
ea.addr_count++;
|
ea.addr_count++;
|
||||||
|
|
||||||
if (*ea.cmd == ';') {
|
if (*ea.cmd == ';') {
|
||||||
if (!ea.skip) {
|
if (!ea.skip)
|
||||||
curwin->w_cursor.lnum = ea.line2;
|
curwin->w_cursor.lnum = ea.line2;
|
||||||
// Don't leave the cursor on an illegal line (caused by ';')
|
} else if (*ea.cmd != ',')
|
||||||
check_cursor_lnum();
|
|
||||||
}
|
|
||||||
} else if (*ea.cmd != ',') {
|
|
||||||
break;
|
break;
|
||||||
}
|
++ea.cmd;
|
||||||
ea.cmd++;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* One address given: set start and end lines */
|
/* One address given: set start and end lines */
|
||||||
@ -1684,6 +1680,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
|
|||||||
ea.addr_count = 0;
|
ea.addr_count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Don't leave the cursor on an illegal line (caused by ';') */
|
||||||
|
check_cursor_lnum();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 5. Parse the command.
|
* 5. Parse the command.
|
||||||
*/
|
*/
|
||||||
|
@ -232,10 +232,3 @@ func Test_paste_in_cmdline()
|
|||||||
call assert_equal('"aaa a;b-c*d bbb', @:)
|
call assert_equal('"aaa a;b-c*d bbb', @:)
|
||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_illegal_address()
|
|
||||||
new
|
|
||||||
2;'(
|
|
||||||
2;')
|
|
||||||
quit
|
|
||||||
endfunc
|
|
||||||
|
@ -596,7 +596,7 @@ static const int included_patches[] = {
|
|||||||
136,
|
136,
|
||||||
135,
|
135,
|
||||||
// 134,
|
// 134,
|
||||||
133,
|
// 133,
|
||||||
// 132,
|
// 132,
|
||||||
// 131,
|
// 131,
|
||||||
// 130 NA
|
// 130 NA
|
||||||
|
Loading…
Reference in New Issue
Block a user