diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-10-24 20:49:43 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-10-24 20:49:43 +0200 |
commit | e10044015841711b989f9a898d427bcc1fdb4c32 (patch) | |
tree | 256dbf4f826bbc408bb1eca2b381c4dc4f953eb6 /src/search.c | |
parent | 5661ed6c833e05467cab33cb9b1c535e7e5cc570 (diff) | |
download | vim-git-e10044015841711b989f9a898d427bcc1fdb4c32.tar.gz |
patch 8.2.1898: command modifier parsing always uses global cmdmodv8.2.1898
Problem: Command modifier parsing always uses global cmdmod.
Solution: Pass in cmdmod_T to use. Rename struct fields consistently.
Diffstat (limited to 'src/search.c')
-rw-r--r-- | src/search.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/search.c b/src/search.c index 18d545a2e..ebeb3f9b9 100644 --- a/src/search.c +++ b/src/search.c @@ -189,7 +189,8 @@ search_regcomp( * Save the currently used pattern in the appropriate place, * unless the pattern should not be remembered. */ - if (!(options & SEARCH_KEEP) && !cmdmod.keeppatterns) + if (!(options & SEARCH_KEEP) + && (cmdmod.cmod_flags & CMOD_KEEPPATTERNS) == 0) { // search or global command if (pat_save == RE_SEARCH || pat_save == RE_BOTH) @@ -1661,7 +1662,7 @@ do_search( curwin->w_set_curswant = TRUE; end_do_search: - if ((options & SEARCH_KEEP) || cmdmod.keeppatterns) + if ((options & SEARCH_KEEP) || (cmdmod.cmod_flags & CMOD_KEEPPATTERNS)) spats[0].off = old_off; vim_free(strcopy); vim_free(msgbuf); |