From 2894d04b19cb84b312bd9b2f88e327a0a6bae303 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 27 Mar 2019 21:30:18 -0400 Subject: vim-patch:8.1.0887: the 'l' flag in :subsitute is sticky Problem: The 'l' flag in :subsitute is sticky. Solution: Reset the flag. (Dominique Pelle, closes vim/vim#3925) https://github.com/vim/vim/commit/9474716d39764ac5642e55b5548580cf53bd9bed --- src/nvim/ex_cmds.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/ex_cmds.c') diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 4356767cc9..dd9f8203c1 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; -- cgit From 4b960025336acc9a6510185796db37fe0b0a9778 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 27 Mar 2019 21:33:25 -0400 Subject: 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 --- src/nvim/ex_cmds.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/nvim/ex_cmds.c') 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) { -- cgit