Mercurial > vim
diff src/cmdexpand.c @ 23272:a84e7abb0c92 v8.2.2182
patch 8.2.2182: Vim9: value of 'magic' is still relevant
Commit: https://github.com/vim/vim/commit/f4e2099e39ed4d71aed0f9a9579455aed5ec6cc2
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 21 19:59:08 2020 +0100
patch 8.2.2182: Vim9: value of 'magic' is still relevant
Problem: Vim9: value of 'magic' is still relevant.
Solution: Always behave like 'magic' is on in Vim9 script (closes https://github.com/vim/vim/issues/7509)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 21 Dec 2020 20:00:06 +0100 |
| parents | b545334ae654 |
| children | 32a9d01c2a49 |
line wrap: on
line diff
--- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -1391,7 +1391,7 @@ set_one_cmd_context( if (*arg != NUL) { xp->xp_context = EXPAND_NOTHING; - arg = skip_regexp(arg + 1, *arg, p_magic); + arg = skip_regexp(arg + 1, *arg, magic_isset()); } } return find_nextcmd(arg); @@ -1429,7 +1429,7 @@ set_one_cmd_context( { // skip "from" part ++arg; - arg = skip_regexp(arg, delim, p_magic); + arg = skip_regexp(arg, delim, magic_isset()); } // skip "to" part while (arg[0] != NUL && arg[0] != delim) @@ -2077,7 +2077,7 @@ ExpandFromContext( pat = tofree; } - regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0); + regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0); if (regmatch.regprog == NULL) return FAIL;