diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-21 19:59:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-21 19:59:08 +0100 |
| commit | f4e2099e39ed4d71aed0f9a9579455aed5ec6cc2 (patch) | |
| tree | 40a384257e29f443c46bbaa19fb88a8eb5441b05 /src/ex_docmd.c | |
| parent | a3d10a508c404a32485adc86284725e0bdc5b602 (diff) | |
| download | vim-git-f4e2099e39ed4d71aed0f9a9579455aed5ec6cc2.tar.gz | |
patch 8.2.2182: Vim9: value of 'magic' is still relevantv8.2.2182
Problem: Vim9: value of 'magic' is still relevant.
Solution: Always behave like 'magic' is on in Vim9 script (closes #7509)
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 95d4dd16b..b1dcc6f0d 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -3951,7 +3951,7 @@ get_address( } if (skip) // skip "/pat/" { - cmd = skip_regexp(cmd, c, (int)p_magic); + cmd = skip_regexp(cmd, c, magic_isset()); if (*cmd == c) ++cmd; } @@ -6535,9 +6535,9 @@ ex_open(exarg_T *eap) { // ":open /pattern/": put cursor in column found with pattern ++eap->arg; - p = skip_regexp(eap->arg, '/', p_magic); + p = skip_regexp(eap->arg, '/', magic_isset()); *p = NUL; - regmatch.regprog = vim_regcomp(eap->arg, p_magic ? RE_MAGIC : 0); + regmatch.regprog = vim_regcomp(eap->arg, magic_isset() ? RE_MAGIC : 0); if (regmatch.regprog != NULL) { regmatch.rm_ic = p_ic; @@ -7529,11 +7529,11 @@ ex_may_print(exarg_T *eap) static void ex_submagic(exarg_T *eap) { - int magic_save = p_magic; + magic_T saved = magic_overruled; - p_magic = (eap->cmdidx == CMD_smagic); + magic_overruled = eap->cmdidx == CMD_smagic ? MAGIC_ON : MAGIC_OFF; ex_substitute(eap); - p_magic = magic_save; + magic_overruled = saved; } /* @@ -8333,7 +8333,7 @@ ex_findpat(exarg_T *eap) { whole = FALSE; ++eap->arg; - p = skip_regexp(eap->arg, '/', p_magic); + p = skip_regexp(eap->arg, '/', magic_isset()); if (*p) { *p++ = NUL; |