Mercurial > vim
changeset 15760:aa80c63f34bb v8.1.0887
patch 8.1.0887: the 'l' flag in :subsitute is sticky
commit https://github.com/vim/vim/commit/9474716d39764ac5642e55b5548580cf53bd9bed
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 10 21:55:26 2019 +0100
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 https://github.com/vim/vim/issues/3925)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 10 Feb 2019 22:00:08 +0100 |
parents | fa2b1f8d6203 |
children | e2d967c0caf5 |
files | src/ex_cmds.c src/testdir/test_substitute.vim src/version.c |
diffstat | 3 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2098,7 +2098,7 @@ write_viminfo(char_u *file, int forceit) fp_out = NULL; # ifdef EEXIST /* Avoid trying lots of names while the problem is lack - * of premission, only retry if the file already + * of permission, only retry if the file already * exists. */ if (errno != EEXIST) break; @@ -5040,6 +5040,7 @@ do_sub(exarg_T *eap) } subflags.do_error = TRUE; subflags.do_print = FALSE; + subflags.do_list = FALSE; subflags.do_count = FALSE; subflags.do_number = FALSE; subflags.do_ic = 0;
--- a/src/testdir/test_substitute.vim +++ b/src/testdir/test_substitute.vim @@ -107,6 +107,32 @@ func Test_substitute_variants() endfor endfunc +" Test the l, p, # flags. +func Test_substitute_flags_lp() + new + call setline(1, "abc\tdef\<C-h>ghi") + + let a = execute('s/a/a/p') + call assert_equal("\nabc def^Hghi", a) + + let a = execute('s/a/a/l') + call assert_equal("\nabc^Idef^Hghi$", a) + + let a = execute('s/a/a/#') + call assert_equal("\n 1 abc def^Hghi", a) + + let a = execute('s/a/a/p#') + call assert_equal("\n 1 abc def^Hghi", a) + + let a = execute('s/a/a/l#') + call assert_equal("\n 1 abc^Idef^Hghi$", a) + + let a = execute('s/a/a/') + call assert_equal("", a) + + bwipe! +endfunc + func Test_substitute_repeat() " This caused an invalid memory access. split Xfile