diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-04 08:38:38 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-12-04 10:07:04 +0800 |
| commit | a91ba088abf7b21f640f671ad7f211c0957b4765 (patch) | |
| tree | a1f206ecc559b64767e667945587b324c5ac3e12 /src/nvim/cmdexpand.c | |
| parent | fba0562723a1af143c9e9509920d03d8231b8bf7 (diff) | |
| download | rneovim-a91ba088abf7b21f640f671ad7f211c0957b4765.tar.gz rneovim-a91ba088abf7b21f640f671ad7f211c0957b4765.tar.bz2 rneovim-a91ba088abf7b21f640f671ad7f211c0957b4765.zip | |
vim-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 vim/vim#7509)
https://github.com/vim/vim/commit/f4e2099e39ed4d71aed0f9a9579455aed5ec6cc2
EX_NONWHITE_OK is N/A: only applies to Vim9 script.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/cmdexpand.c')
| -rw-r--r-- | src/nvim/cmdexpand.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c index f1231908c7..9619c81636 100644 --- a/src/nvim/cmdexpand.c +++ b/src/nvim/cmdexpand.c @@ -1505,7 +1505,7 @@ static const char *set_context_by_cmdname(const char *cmd, cmdidx_T cmdidx, cons arg = (const char *)skipwhite(skiptowhite(arg)); if (*arg != NUL) { xp->xp_context = EXPAND_NOTHING; - arg = (const char *)skip_regexp((char *)arg + 1, (uint8_t)(*arg), p_magic); + arg = (const char *)skip_regexp((char *)arg + 1, (uint8_t)(*arg), magic_isset()); } } return (const char *)find_nextcmd(arg); @@ -1544,7 +1544,7 @@ static const char *set_context_by_cmdname(const char *cmd, cmdidx_T cmdidx, cons if (delim) { // Skip "from" part. arg++; - arg = (const char *)skip_regexp((char *)arg, delim, p_magic); + arg = (const char *)skip_regexp((char *)arg, delim, magic_isset()); } // Skip "to" part. while (arg[0] != NUL && (uint8_t)arg[0] != delim) { @@ -2458,7 +2458,7 @@ static int ExpandFromContext(expand_T *xp, char *pat, int *num_file, char ***fil return nlua_expand_pat(xp, pat, num_file, file); } - 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; } |