aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.2425: cursor on invalid line with range and :substitute

Browse Source 
Problem:    Cursor on invalid line with range and :substitute.
Solution:   Do not move the cursor when skipping commands. (closes #3434)
This commit is contained in:
Bram Moolenaar
2021-01-28 20:18:08 +01:00
parent 97202d9516
commit df2c2988bb
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_cmds.c
View File

@@ -3747,6 +3747,8 @@ ex_substitute(exarg_T *eap)
{ {
linenr_T joined_lines_count; linenr_T joined_lines_count;
if (eap->skip)
return;
curwin->w_cursor.lnum = eap->line1; curwin->w_cursor.lnum = eap->line1;
if (*cmd == 'l') if (*cmd == 'l')
eap->flags = EXFLAG_LIST; eap->flags = EXFLAG_LIST;

5
src/testdir/test_eval_stuff.vim
View File

@@ -68,6 +68,11 @@ func Test_for_invalid()
call assert_fails("for x in 99", 'E714:') call assert_fails("for x in 99", 'E714:')
call assert_fails("for x in 'asdf'", 'E714:') call assert_fails("for x in 'asdf'", 'E714:')
call assert_fails("for x in {'a': 9}", 'E714:') call assert_fails("for x in {'a': 9}", 'E714:')
if 0
/1/5/2/s/\n
endif
redraw
endfunc endfunc
func Test_readfile_binary() func Test_readfile_binary()

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2425,
/**/ /**/
2424, 2424,
/**/ /**/