diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-27 22:53:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-27 22:53:53 +0100 |
| commit | 0e97b9487571cf725a9cb28fe4dcefc800415f69 (patch) | |
| tree | 8e3c232261680bf2f82a40eb4e245a75949eef68 /src/ex_cmds.c | |
| parent | 760285dd4f20d25e8ae3166996981b8dddba366a (diff) | |
patch 8.1.1061: when substitute string throws error, substitute happens anywayv8.1.1061
Problem: When substitute string throws error, substitute happens anyway.
Solution: Skip substitution when aborting. (closes #4161)
Diffstat (limited to 'src/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 1b73ba3bab..25441247af 100644 --- 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) { |