diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-27 21:33:25 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-27 21:35:02 -0400 |
| commit | 4b960025336acc9a6510185796db37fe0b0a9778 (patch) | |
| tree | 154cea91ada7a15f7e649c987e5e3072d8e1a7a4 /src/nvim/ex_cmds.c | |
| parent | 2894d04b19cb84b312bd9b2f88e327a0a6bae303 (diff) | |
| download | rneovim-4b960025336acc9a6510185796db37fe0b0a9778.tar.gz rneovim-4b960025336acc9a6510185796db37fe0b0a9778.tar.bz2 rneovim-4b960025336acc9a6510185796db37fe0b0a9778.zip | |
vim-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 vim/vim#4161)
https://github.com/vim/vim/commit/0e97b9487571cf725a9cb28fe4dcefc800415f69
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index dd9f8203c1..af92a9c846 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -3831,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) { |