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 #7509)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 95d4dd1..b1dcc6f 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3951,7 +3951,7 @@
}
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 @@
{
// ":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 @@
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 @@
{
whole = FALSE;
++eap->arg;
- p = skip_regexp(eap->arg, '/', p_magic);
+ p = skip_regexp(eap->arg, '/', magic_isset());
if (*p)
{
*p++ = NUL;