diff src/ex_cmds.c @ 16113:9994c50f7879 v8.1.1061

patch 8.1.1061: when substitute string throws error, substitute happens anyway commit https://github.com/vim/vim/commit/0e97b9487571cf725a9cb28fe4dcefc800415f69 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 27 22:53:53 2019 +0100 patch 8.1.1061: when substitute string throws error, substitute happens anyway Problem: When substitute string throws error, substitute happens anyway. Solution: Skip substitution when aborting. (closes https://github.com/vim/vim/issues/4161)
author Bram Moolenaar <Bram@vim.org>
date Wed, 27 Mar 2019 23:00:05 +0100
parents 5417a7f802ff
children cd5c83115ec6
line wrap: on
line diff
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5574,7 +5574,12 @@ do_sub(exarg_T *eap)
 				    sub_firstlnum - regmatch.startpos[0].lnum,
 				    sub, sub_firstline, FALSE, p_magic, TRUE);
 #ifdef FEAT_EVAL
-		/* Don't keep flags set by a recursive call. */
+		// If getting the substitute string caused an error, don't do
+		// the replacement.
+		if (aborting())
+		    goto skip;
+
+		// Don't keep flags set by a recursive call.
 		subflags = subflags_save;
 		if (subflags.do_count)
 		{