adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1807: :set doesn't clear local insecure flag like :setlocal does

Browse Source 
Problem:  :set doesn't clear local insecure flag like :setlocal does.
Solution: Also clear the local insecure flag when using :set (zeertzjq).

This applies to local options like 'wrap', 'foldtext' and 'foldexpr',
whose global flags are actually never used.  For global-local options
like 'statusline' the behavior is already correct, so add some tests.

related: #18434

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2025-09-29 19:26:36 +00:00
committed by Christian Brabandt
parent 992e30774f
commit fec5586a45
5 changed files with 187 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/option.c
View File

@ -831,6 +831,11 @@ set_option_default(
// The default value is not insecure.
flagsp = insecure_flag(opt_idx, opt_flags);
*flagsp = *flagsp & ~P_INSECURE;
if (both)
{
flagsp = insecure_flag(opt_idx, OPT_LOCAL);
*flagsp = *flagsp & ~P_INSECURE;
}
}
#ifdef FEAT_EVAL
@ -2781,22 +2786,34 @@ did_set_option(
int value_checked) // value was checked to be safe, no need to set the
// P_INSECURE flag.
{
long_u *p;
long_u *flagsp;
long_u *flagsp_local = NULL;
int both = (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0;
options[opt_idx].flags |= P_WAS_SET;
// When an option is set in the sandbox, from a modeline or in secure mode
// set the P_INSECURE flag. Otherwise, if a new value is stored reset the
// flag.
p = insecure_flag(opt_idx, opt_flags);
flagsp = insecure_flag(opt_idx, opt_flags);
if (both)
flagsp_local = insecure_flag(opt_idx, OPT_LOCAL);
if (!value_checked && (secure
#ifdef HAVE_SANDBOX
|| sandbox != 0
#endif
|| (opt_flags & OPT_MODELINE)))
*p = *p | P_INSECURE;
{
*flagsp = *flagsp | P_INSECURE;
if (flagsp_local != NULL)
*flagsp_local = *flagsp_local | P_INSECURE;
}
else if (new_value)
*p = *p & ~P_INSECURE;
{
*flagsp = *flagsp & ~P_INSECURE;
if (flagsp_local != NULL)
*flagsp_local = *flagsp_local & ~P_INSECURE;
}
}
/*