Mercurial > vim

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
16112:58f1e71bc938 16113:9994c50f7879
5572 /* get length of substitution part */ 5572 /* get length of substitution part */
5573 sublen = vim_regsub_multi(&regmatch, 5573 sublen = vim_regsub_multi(&regmatch,
5574 sub_firstlnum - regmatch.startpos[0].lnum, 5574 sub_firstlnum - regmatch.startpos[0].lnum,
5575 sub, sub_firstline, FALSE, p_magic, TRUE); 5575 sub, sub_firstline, FALSE, p_magic, TRUE);
5576 #ifdef FEAT_EVAL 5576 #ifdef FEAT_EVAL
5577 /* Don't keep flags set by a recursive call. */ 5577 // If getting the substitute string caused an error, don't do
5578 // the replacement.
5579 if (aborting())
5580 goto skip;
5581
5582 // Don't keep flags set by a recursive call.
5578 subflags = subflags_save; 5583 subflags = subflags_save;
5579 if (subflags.do_count) 5584 if (subflags.do_count)
5580 { 5585 {
5581 curbuf->b_p_ma = save_ma; 5586 curbuf->b_p_ma = save_ma;
5582 if (sandbox > 0) 5587 if (sandbox > 0)