From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jan 2021 19:18:08 +0000 (+0100)
Subject: patch 8.2.2425: cursor on invalid line with range and :substitute
X-Git-Tag: v8.2.2425
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df2c2988bbaecd28b0fbec8d64327b1bbb005e19;p=vim

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

Problem:    Cursor on invalid line with range and :substitute.
Solution:   Do not move the cursor when skipping commands. (closes #3434)
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 545e06dbd..12219e7ba 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3747,6 +3747,8 @@ ex_substitute(exarg_T *eap)
     {
 	linenr_T    joined_lines_count;
 
+	if (eap->skip)
+	    return;
 	curwin->w_cursor.lnum = eap->line1;
 	if (*cmd == 'l')
 	    eap->flags = EXFLAG_LIST;
diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 52e8df924..95f5b2497 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -68,6 +68,11 @@ func Test_for_invalid()
   call assert_fails("for x in 99", 'E714:')
   call assert_fails("for x in 'asdf'", 'E714:')
   call assert_fails("for x in {'a': 9}", 'E714:')
+
+  if 0
+    /1/5/2/s/\n
+  endif
+  redraw
 endfunc
 
 func Test_readfile_binary()
diff --git a/src/version.c b/src/version.c
index fbdb35cc6..2e0da2b3a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2425,
 /**/
     2424,
 /**/