diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-03-28 12:32:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 12:32:41 +0100 |
| commit | 76204da1f8ed63f7b0ef15ad7c71ce6e2e58d8fb (patch) | |
| tree | 154cea91ada7a15f7e649c987e5e3072d8e1a7a4 /src/nvim/ex_cmds.c | |
| parent | 2470c88291ef1e4db6b49fd1adf17bc7fb6ecd39 (diff) | |
| parent | 4b960025336acc9a6510185796db37fe0b0a9778 (diff) | |
| download | rneovim-76204da1f8ed63f7b0ef15ad7c71ce6e2e58d8fb.tar.gz rneovim-76204da1f8ed63f7b0ef15ad7c71ce6e2e58d8fb.tar.bz2 rneovim-76204da1f8ed63f7b0ef15ad7c71ce6e2e58d8fb.zip | |
Merge #9802 from janlazo/vim-8.1.0887
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 4356767cc9..af92a9c846 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3181,6 +3181,7 @@ static char_u *sub_parse_flags(char_u *cmd, subflags_T *subflags, subflags->do_ask = false; subflags->do_error = true; subflags->do_print = false; + subflags->do_list = false; subflags->do_count = false; subflags->do_number = false; subflags->do_ic = kSubHonorOptions; @@ -3830,6 +3831,12 @@ static buf_T *do_sub(exarg_T *eap, proftime_T timeout, sublen = vim_regsub_multi(®match, sub_firstlnum - regmatch.startpos[0].lnum, sub, sub_firstline, false, p_magic, true); + // 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) { |