mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(options): option flags enum #30961

Browse Source 
Problem: Currently we use macros with hardcoded flag values for option flags, which is messy and requires a lot of mental math for adding / removing option flags. Using macros for option flags also means that they cannot be used inside debuggers.

Solution: Create a new `OptFlags` enum that stores all the option flags in an organized way that is easier to understand.
This commit is contained in:
Famiu Haque
2024-10-28 19:49:16 +06:00
committed by GitHub
parent 0b7cc014fc
commit 34c44c3556
8 changed files with 144 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/buffer_defs.h
View File

@@ -1249,7 +1249,7 @@ struct window_S {
// transform a pointer to a "onebuf" option into a "allbuf" option // transform a pointer to a "onebuf" option into a "allbuf" option
#define GLOBAL_WO(p) ((char *)(p) + sizeof(winopt_T)) #define GLOBAL_WO(p) ((char *)(p) + sizeof(winopt_T))
// A few options have local flags for P_INSECURE. // A few options have local flags for kOptFlagInsecure.
uint32_t w_p_stl_flags; // flags for 'statusline' uint32_t w_p_stl_flags; // flags for 'statusline'
uint32_t w_p_wbr_flags; // flags for 'winbar' uint32_t w_p_wbr_flags; // flags for 'winbar'
uint32_t w_p_fde_flags; // flags for 'foldexpr' uint32_t w_p_fde_flags; // flags for 'foldexpr'

2
src/nvim/cmdexpand.c
View File

@@ -1350,7 +1350,7 @@ char *addstar(char *fname, size_t len, int context)
/// it. /// it.
/// EXPAND_BUFFERS Complete file names for :buf and :sbuf commands. /// EXPAND_BUFFERS Complete file names for :buf and :sbuf commands.
/// EXPAND_FILES After command with EX_XFILE set, or after setting /// EXPAND_FILES After command with EX_XFILE set, or after setting
/// with P_EXPAND set. eg :e ^I, :w>>^I /// with kOptFlagExpand set. eg :e ^I, :w>>^I
/// EXPAND_DIRECTORIES In some cases this is used instead of the latter /// EXPAND_DIRECTORIES In some cases this is used instead of the latter
/// when we know only directories are of interest. /// when we know only directories are of interest.
/// E.g. :set dir=^I and :cd ^I /// E.g. :set dir=^I and :cd ^I

2
src/nvim/eval/vars.c
View File

@@ -1908,7 +1908,7 @@ static OptVal tv_to_optval(typval_T *tv, OptIndex opt_idx, const char *option, b
const bool option_has_num = !is_tty_opt && option_has_type(opt_idx, kOptValTypeNumber); const bool option_has_num = !is_tty_opt && option_has_type(opt_idx, kOptValTypeNumber);
const bool option_has_str = is_tty_opt || option_has_type(opt_idx, kOptValTypeString); const bool option_has_str = is_tty_opt || option_has_type(opt_idx, kOptValTypeString);
if (!is_tty_opt && (get_option(opt_idx)->flags & P_FUNC) && tv_is_func(*tv)) { if (!is_tty_opt && (get_option(opt_idx)->flags & kOptFlagFunc) && tv_is_func(*tv)) {
// If the option can be set to a function reference or a lambda // If the option can be set to a function reference or a lambda
// and the passed value is a function reference, then convert it to // and the passed value is a function reference, then convert it to
// the name (string) of the function reference. // the name (string) of the function reference.

52
src/nvim/generators/gen_options.lua
View File

@@ -16,23 +16,23 @@ local options = require('options')
local cstr = options.cstr local cstr = options.cstr
local redraw_flags = { local redraw_flags = {
ui_option = 'P_UI_OPTION', ui_option = 'kOptFlagUIOption',
tabline = 'P_RTABL', tabline = 'kOptFlagRedrTabl',
statuslines = 'P_RSTAT', statuslines = 'kOptFlagRedrStat',
current_window = 'P_RWIN', current_window = 'kOptFlagRedrWin',
current_buffer = 'P_RBUF', current_buffer = 'kOptFlagRedrBuf',
all_windows = 'P_RALL', all_windows = 'kOptFlagRedrAll',
curswant = 'P_CURSWANT', curswant = 'kOptFlagCurswant',
highlight_only = 'P_HLONLY', highlight_only = 'kOptFlagHLOnly',
} }
local list_flags = { local list_flags = {
comma = 'P_COMMA', comma = 'kOptFlagComma',
onecomma = 'P_ONECOMMA', onecomma = 'kOptFlagOneComma',
commacolon = 'P_COMMA|P_COLON', commacolon = 'kOptFlagComma|kOptFlagColon',
onecommacolon = 'P_ONECOMMA|P_COLON', onecommacolon = 'kOptFlagOneComma|kOptFlagColon',
flags = 'P_FLAGLIST', flags = 'kOptFlagFlagList',
flagscomma = 'P_COMMA|P_FLAGLIST', flagscomma = 'kOptFlagComma|kOptFlagFlagList',
} }
--- @param s string --- @param s string
@@ -61,27 +61,27 @@ local function get_flags(o)
end end
end end
if o.expand then if o.expand then
add_flag('P_EXPAND') add_flag('kOptFlagExpand')
if o.expand == 'nodefault' then if o.expand == 'nodefault' then
add_flag('P_NO_DEF_EXP') add_flag('kOptFlagNoDefExp')
end end
end end
for _, flag_desc in ipairs({ for _, flag_desc in ipairs({
{ 'nodefault' }, { 'nodefault', 'NoDefault' },
{ 'no_mkrc' }, { 'no_mkrc', 'NoMkrc' },
{ 'secure' }, { 'secure' },
{ 'gettext' }, { 'gettext' },
{ 'noglob' }, { 'noglob', 'NoGlob' },
{ 'normal_fname_chars', 'P_NFNAME' }, { 'normal_fname_chars', 'NFname' },
{ 'normal_dname_chars', 'P_NDNAME' }, { 'normal_dname_chars', 'NDname' },
{ 'pri_mkrc' }, { 'pri_mkrc', 'PriMkrc' },
{ 'deny_in_modelines', 'P_NO_ML' }, { 'deny_in_modelines', 'NoML' },
{ 'deny_duplicates', 'P_NODUP' }, { 'deny_duplicates', 'NoDup' },
{ 'modelineexpr', 'P_MLE' }, { 'modelineexpr', 'MLE' },
{ 'func' }, { 'func' },
}) do }) do
local key_name = flag_desc[1] local key_name = flag_desc[1]
local def_name = flag_desc[2] or ('P_' .. key_name:upper()) local def_name = 'kOptFlag' .. (flag_desc[2] or lowercase_to_titlecase(key_name))
if o[key_name] then if o[key_name] then
add_flag(def_name) add_flag(def_name)
end end

151
src/nvim/option.c
View File

@@ -305,11 +305,11 @@ static void set_init_expand_env(void)
{ {
for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) { for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) {
vimoption_T *opt = &options[opt_idx]; vimoption_T *opt = &options[opt_idx];
if (opt->flags & P_NO_DEF_EXP) { if (opt->flags & kOptFlagNoDefExp) {
continue; continue;
} }
char *p; char *p;
if ((opt->flags & P_GETTEXT) && opt->var != NULL) { if ((opt->flags & kOptFlagGettext) && opt->var != NULL) {
p = _(*(char **)opt->var); p = _(*(char **)opt->var);
} else { } else {
p = option_expand(opt_idx, NULL); p = option_expand(opt_idx, NULL);
@@ -447,7 +447,7 @@ static OptVal get_option_default(const OptIndex opt_idx, int opt_flags)
if ((opt_flags & OPT_LOCAL) && is_global_local_option) { if ((opt_flags & OPT_LOCAL) && is_global_local_option) {
// Use unset local value instead of default value for local scope of global-local options. // Use unset local value instead of default value for local scope of global-local options.
return get_option_unset_value(opt_idx); return get_option_unset_value(opt_idx);
} else if (option_has_type(opt_idx, kOptValTypeString) && !(opt->flags & P_NO_DEF_EXP)) { } else if (option_has_type(opt_idx, kOptValTypeString) && !(opt->flags & kOptFlagNoDefExp)) {
// For string options, expand environment variables and ~ since the default value was already // For string options, expand environment variables and ~ since the default value was already
// expanded, only required when an environment variable was set later. // expanded, only required when an environment variable was set later.
char *s = option_expand(opt_idx, opt->def_val.data.string.data); char *s = option_expand(opt_idx, opt->def_val.data.string.data);
@@ -492,7 +492,7 @@ static void set_option_default(const OptIndex opt_idx, int opt_flags)
// The default value is not insecure. // The default value is not insecure.
uint32_t *flagsp = insecure_flag(curwin, opt_idx, opt_flags); uint32_t *flagsp = insecure_flag(curwin, opt_idx, opt_flags);
*flagsp = *flagsp & ~P_INSECURE; *flagsp = *flagsp & ~(unsigned)kOptFlagInsecure;
} }
/// Set all options (except terminal options) to their default value. /// Set all options (except terminal options) to their default value.
@@ -501,7 +501,7 @@ static void set_option_default(const OptIndex opt_idx, int opt_flags)
static void set_options_default(int opt_flags) static void set_options_default(int opt_flags)
{ {
for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) { for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) {
if (!(options[opt_idx].flags & P_NODEFAULT)) { if (!(options[opt_idx].flags & kOptFlagNoDefault)) {
set_option_default(opt_idx, opt_flags); set_option_default(opt_idx, opt_flags);
} }
} }
@@ -542,9 +542,9 @@ static char *find_dup_item(char *origval, const char *newval, const size_t newva
int bs = 0; int bs = 0;
for (char *s = origval; *s != NUL; s++) { for (char *s = origval; *s != NUL; s++) {
if ((!(flags & P_COMMA) || s == origval || (s[-1] == ',' && !(bs & 1))) if ((!(flags & kOptFlagComma) || s == origval || (s[-1] == ',' && !(bs & 1)))
&& strncmp(s, newval, newvallen) == 0 && strncmp(s, newval, newvallen) == 0
&& (!(flags & P_COMMA) || s[newvallen] == ',' || s[newvallen] == NUL)) { && (!(flags & kOptFlagComma) || s[newvallen] == ',' || s[newvallen] == NUL)) {
return s; return s;
} }
// Count backslashes. Only a comma with an even number of backslashes // Count backslashes. Only a comma with an even number of backslashes
@@ -592,7 +592,7 @@ void set_init_2(bool headless)
// 'scroll' defaults to half the window height. The stored default is zero, // 'scroll' defaults to half the window height. The stored default is zero,
// which results in the actual value computed from the window height. // which results in the actual value computed from the window height.
if (!(options[kOptScroll].flags & P_WAS_SET)) { if (!(options[kOptScroll].flags & kOptFlagWasSet)) {
set_option_default(kOptScroll, OPT_LOCAL); set_option_default(kOptScroll, OPT_LOCAL);
} }
comp_col(); comp_col();
@@ -613,8 +613,8 @@ void set_init_3(void)
// Set 'shellpipe' and 'shellredir', depending on the 'shell' option. // Set 'shellpipe' and 'shellredir', depending on the 'shell' option.
// This is done after other initializations, where 'shell' might have been // This is done after other initializations, where 'shell' might have been
// set, but only if they have not been set before. // set, but only if they have not been set before.
bool do_srr = !(options[kOptShellredir].flags & P_WAS_SET); bool do_srr = !(options[kOptShellredir].flags & kOptFlagWasSet);
bool do_sp = !(options[kOptShellpipe].flags & P_WAS_SET); bool do_sp = !(options[kOptShellpipe].flags & kOptFlagWasSet);
size_t len = 0; size_t len = 0;
char *p = (char *)invocation_path_tail(p_sh, &len); char *p = (char *)invocation_path_tail(p_sh, &len);
@@ -648,7 +648,7 @@ void set_init_3(void)
int idx_ffs = find_option("ffs"); int idx_ffs = find_option("ffs");
// Apply the first entry of 'fileformats' to the initial buffer. // Apply the first entry of 'fileformats' to the initial buffer.
if (idx_ffs >= 0 && (options[idx_ffs].flags & P_WAS_SET)) { if (idx_ffs >= 0 && (options[idx_ffs].flags & kOptFlagWasSet)) {
set_fileformat(default_fileformat(), OPT_LOCAL); set_fileformat(default_fileformat(), OPT_LOCAL);
} }
} }
@@ -668,7 +668,7 @@ void set_helplang_default(const char *lang)
if (lang_len < 2) { // safety check if (lang_len < 2) { // safety check
return; return;
} }
if (options[kOptHelplang].flags & P_WAS_SET) { if (options[kOptHelplang].flags & kOptFlagWasSet) {
return; return;
} }
@@ -696,11 +696,11 @@ void set_title_defaults(void)
// If GUI is (going to be) used, we can always set the window title and // If GUI is (going to be) used, we can always set the window title and
// icon name. Saves a bit of time, because the X11 display server does // icon name. Saves a bit of time, because the X11 display server does
// not need to be contacted. // not need to be contacted.
if (!(options[kOptTitle].flags & P_WAS_SET)) { if (!(options[kOptTitle].flags & kOptFlagWasSet)) {
change_option_default(kOptTitle, BOOLEAN_OPTVAL(false)); change_option_default(kOptTitle, BOOLEAN_OPTVAL(false));
p_title = 0; p_title = 0;
} }
if (!(options[kOptIcon].flags & P_WAS_SET)) { if (!(options[kOptIcon].flags & kOptFlagWasSet)) {
change_option_default(kOptIcon, BOOLEAN_OPTVAL(false)); change_option_default(kOptIcon, BOOLEAN_OPTVAL(false));
p_icon = 0; p_icon = 0;
} }
@@ -744,7 +744,7 @@ static char *stropt_copy_value(char *origval, char **argp, set_op_T op,
while (*arg != NUL && !ascii_iswhite(*arg)) { while (*arg != NUL && !ascii_iswhite(*arg)) {
if (*arg == '\\' && arg[1] != NUL if (*arg == '\\' && arg[1] != NUL
#ifdef BACKSLASH_IN_FILENAME #ifdef BACKSLASH_IN_FILENAME
&& !((flags & P_EXPAND) && !((flags & kOptFlagExpand)
&& vim_isfilec((uint8_t)arg[1]) && vim_isfilec((uint8_t)arg[1])
&& !ascii_iswhite(arg[1]) && !ascii_iswhite(arg[1])
&& (arg[1] != '\\' && (arg[1] != '\\'
@@ -793,12 +793,12 @@ static char *stropt_expand_envvar(OptIndex opt_idx, char *origval, char *newval,
static void stropt_concat_with_comma(char *origval, char *newval, set_op_T op, uint32_t flags) static void stropt_concat_with_comma(char *origval, char *newval, set_op_T op, uint32_t flags)
{ {
int len = 0; int len = 0;
int comma = ((flags & P_COMMA) && *origval != NUL && *newval != NUL); int comma = ((flags & kOptFlagComma) && *origval != NUL && *newval != NUL);
if (op == OP_ADDING) { if (op == OP_ADDING) {
len = (int)strlen(origval); len = (int)strlen(origval);
// Strip a trailing comma, would get 2. // Strip a trailing comma, would get 2.
if (comma && len > 1 if (comma && len > 1
&& (flags & P_ONECOMMA) == P_ONECOMMA && (flags & kOptFlagOneComma) == kOptFlagOneComma
&& origval[len - 1] == ',' && origval[len - 1] == ','
&& origval[len - 2] != '\\') { && origval[len - 2] != '\\') {
len--; len--;
@@ -823,7 +823,7 @@ static void stropt_remove_val(char *origval, char *newval, uint32_t flags, char
STRCPY(newval, origval); STRCPY(newval, origval);
if (*strval) { if (*strval) {
// may need to remove a comma // may need to remove a comma
if (flags & P_COMMA) { if (flags & kOptFlagComma) {
if (strval == origval) { if (strval == origval) {
// include comma after string // include comma after string
if (strval[len] == ',') { if (strval[len] == ',') {
@@ -845,8 +845,8 @@ static void stropt_remove_dupflags(char *newval, uint32_t flags)
char *s = newval; char *s = newval;
// Remove flags that appear twice. // Remove flags that appear twice.
for (s = newval; *s;) { for (s = newval; *s;) {
// if options have P_FLAGLIST and P_ONECOMMA such as 'whichwrap' // if options have kOptFlagFlagList and kOptFlagOneComma such as 'whichwrap'
if (flags & P_ONECOMMA) { if (flags & kOptFlagOneComma) {
if (*s != ',' && *(s + 1) == ',' if (*s != ',' && *(s + 1) == ','
&& vim_strchr(s + 2, (uint8_t)(*s)) != NULL) { && vim_strchr(s + 2, (uint8_t)(*s)) != NULL) {
// Remove the duplicated value and the next comma. // Remove the duplicated value and the next comma.
@@ -854,7 +854,7 @@ static void stropt_remove_dupflags(char *newval, uint32_t flags)
continue; continue;
} }
} else { } else {
if ((!(flags & P_COMMA) || *s != ',') if ((!(flags & kOptFlagComma) || *s != ',')
&& vim_strchr(s + 1, (uint8_t)(*s)) != NULL) { && vim_strchr(s + 1, (uint8_t)(*s)) != NULL) {
STRMOVE(s, s + 1); STRMOVE(s, s + 1);
continue; continue;
@@ -890,14 +890,14 @@ static char *stropt_get_newval(int nextchar, OptIndex opt_idx, char **argp, void
// Expand environment variables and ~. // Expand environment variables and ~.
// Don't do it when adding without inserting a comma. // Don't do it when adding without inserting a comma.
if (op == OP_NONE || (flags & P_COMMA)) { if (op == OP_NONE || (flags & kOptFlagComma)) {
newval = stropt_expand_envvar(opt_idx, origval, newval, op); newval = stropt_expand_envvar(opt_idx, origval, newval, op);
} }
// locate newval[] in origval[] when removing it // locate newval[] in origval[] when removing it
// and when adding to avoid duplicates // and when adding to avoid duplicates
int len = 0; int len = 0;
if (op == OP_REMOVING || (flags & P_NODUP)) { if (op == OP_REMOVING || (flags & kOptFlagNoDup)) {
len = (int)strlen(newval); len = (int)strlen(newval);
s = find_dup_item(origval, newval, (size_t)len, flags); s = find_dup_item(origval, newval, (size_t)len, flags);
@@ -922,7 +922,7 @@ static char *stropt_get_newval(int nextchar, OptIndex opt_idx, char **argp, void
stropt_remove_val(origval, newval, flags, s, len); stropt_remove_val(origval, newval, flags, s, len);
} }
if (flags & P_FLAGLIST) { if (flags & kOptFlagFlagList) {
// Remove flags that appear twice. // Remove flags that appear twice.
stropt_remove_dupflags(newval, flags); stropt_remove_dupflags(newval, flags);
} }
@@ -986,11 +986,11 @@ static int validate_opt_idx(win_T *win, OptIndex opt_idx, int opt_flags, uint32_
// Disallow changing some options from modelines. // Disallow changing some options from modelines.
if (opt_flags & OPT_MODELINE) { if (opt_flags & OPT_MODELINE) {
if (flags & (P_SECURE | P_NO_ML)) { if (flags & (kOptFlagSecure | kOptFlagNoML)) {
*errmsg = e_not_allowed_in_modeline; *errmsg = e_not_allowed_in_modeline;
return FAIL; return FAIL;
} }
if ((flags & P_MLE) && !p_mle) { if ((flags & kOptFlagMLE) && !p_mle) {
*errmsg = e_not_allowed_in_modeline_when_modelineexpr_is_off; *errmsg = e_not_allowed_in_modeline_when_modelineexpr_is_off;
return FAIL; return FAIL;
} }
@@ -1006,7 +1006,7 @@ static int validate_opt_idx(win_T *win, OptIndex opt_idx, int opt_flags, uint32_
} }
// Disallow changing some options in the sandbox // Disallow changing some options in the sandbox
if (sandbox != 0 && (flags & P_SECURE)) { if (sandbox != 0 && (flags & kOptFlagSecure)) {
*errmsg = e_sandbox; *errmsg = e_sandbox;
return FAIL; return FAIL;
} }
@@ -1586,7 +1586,7 @@ char *find_shada_parameter(int type)
static char *option_expand(OptIndex opt_idx, char *val) static char *option_expand(OptIndex opt_idx, char *val)
{ {
// if option doesn't need expansion nothing to do // if option doesn't need expansion nothing to do
if (!(options[opt_idx].flags & P_EXPAND) || options[opt_idx].var == NULL) { if (!(options[opt_idx].flags & kOptFlagExpand) || options[opt_idx].var == NULL) {
return NULL; return NULL;
} }
@@ -1677,10 +1677,10 @@ int was_set_insecurely(win_T *const wp, OptIndex opt_idx, int opt_flags)
assert(opt_idx != kOptInvalid); assert(opt_idx != kOptInvalid);
uint32_t *flagp = insecure_flag(wp, opt_idx, opt_flags); uint32_t *flagp = insecure_flag(wp, opt_idx, opt_flags);
return (*flagp & P_INSECURE) != 0; return (*flagp & kOptFlagInsecure) != 0;
} }
/// Get a pointer to the flags used for the P_INSECURE flag of option /// Get a pointer to the flags used for the kOptFlagInsecure flag of option
/// "opt_idx". For some local options a local flags field is used. /// "opt_idx". For some local options a local flags field is used.
/// NOTE: Caller must make sure that "wp" is set to the window from which /// NOTE: Caller must make sure that "wp" is set to the window from which
/// the option is used. /// the option is used.
@@ -2976,25 +2976,25 @@ static const char *validate_num_option(OptIndex opt_idx, void *varp, OptInt *new
/// Called after an option changed: check if something needs to be redrawn. /// Called after an option changed: check if something needs to be redrawn.
void check_redraw_for(buf_T *buf, win_T *win, uint32_t flags) void check_redraw_for(buf_T *buf, win_T *win, uint32_t flags)
{ {
// Careful: P_RALL is a combination of other P_ flags // Careful: kOptFlagRedrAll is a combination of other redraw flags
bool all = (flags & P_RALL) == P_RALL; bool all = (flags & kOptFlagRedrAll) == kOptFlagRedrAll;
if ((flags & P_RSTAT) || all) { // mark all status lines and window bars dirty if ((flags & kOptFlagRedrStat) || all) { // mark all status lines and window bars dirty
status_redraw_all(); status_redraw_all();
} }
if ((flags & P_RTABL) || all) { // mark tablines dirty if ((flags & kOptFlagRedrTabl) || all) { // mark tablines dirty
redraw_tabline = true; redraw_tabline = true;
} }
if ((flags & P_RBUF) || (flags & P_RWIN) || all) { if ((flags & kOptFlagRedrBuf) || (flags & kOptFlagRedrWin) || all) {
if (flags & P_HLONLY) { if (flags & kOptFlagHLOnly) {
redraw_later(win, UPD_NOT_VALID); redraw_later(win, UPD_NOT_VALID);
} else { } else {
changed_window_setting(win); changed_window_setting(win);
} }
} }
if (flags & P_RBUF) { if (flags & kOptFlagRedrBuf) {
redraw_buf_later(buf, UPD_NOT_VALID); redraw_buf_later(buf, UPD_NOT_VALID);
} }
if (all) { if (all) {
@@ -3466,7 +3466,7 @@ static const char *did_set_option(OptIndex opt_idx, void *varp, OptVal old_value
errmsg = e_unsupportedoption; errmsg = e_unsupportedoption;
} }
// Disallow changing some options from secure mode. // Disallow changing some options from secure mode.
else if ((secure || sandbox != 0) && (opt->flags & P_SECURE)) { else if ((secure || sandbox != 0) && (opt->flags & kOptFlagSecure)) {
errmsg = e_secure; errmsg = e_secure;
} }
// Check for a "normal" directory or file name in some string options. // Check for a "normal" directory or file name in some string options.
@@ -3567,7 +3567,8 @@ static const char *did_set_option(OptIndex opt_idx, void *varp, OptVal old_value
} }
if (curwin->w_curswant != MAXCOL if (curwin->w_curswant != MAXCOL
&& (opt->flags & (P_CURSWANT | P_RALL)) != 0 && (opt->flags & P_HLONLY) == 0) { && (opt->flags & (kOptFlagCurswant | kOptFlagRedrAll)) != 0
&& (opt->flags & kOptFlagHLOnly) == 0) {
curwin->w_set_curswant = true; curwin->w_set_curswant = true;
} }
@@ -3575,14 +3576,14 @@ static const char *did_set_option(OptIndex opt_idx, void *varp, OptVal old_value
if (errmsg == NULL) { if (errmsg == NULL) {
uint32_t *p = insecure_flag(curwin, opt_idx, opt_flags); uint32_t *p = insecure_flag(curwin, opt_idx, opt_flags);
opt->flags |= P_WAS_SET; opt->flags |= kOptFlagWasSet;
// When an option is set in the sandbox, from a modeline or in secure mode set the P_INSECURE // When an option is set in the sandbox, from a modeline or in secure mode set the kOptFlagInsecure
// flag. Otherwise, if a new value is stored reset the flag. // flag. Otherwise, if a new value is stored reset the flag.
if (!value_checked && (secure || sandbox != 0 || (opt_flags & OPT_MODELINE))) { if (!value_checked && (secure || sandbox != 0 || (opt_flags & OPT_MODELINE))) {
*p |= P_INSECURE; *p |= kOptFlagInsecure;
} else if (value_replaced) { } else if (value_replaced) {
*p &= ~P_INSECURE; *p &= ~(unsigned)kOptFlagInsecure;
} }
} }
@@ -3700,9 +3701,9 @@ static const char *set_option(const OptIndex opt_idx, void *varp, OptVal value,
const int secure_saved = secure; const int secure_saved = secure;
// When an option is set in the sandbox, from a modeline or in secure mode, then deal with side // When an option is set in the sandbox, from a modeline or in secure mode, then deal with side
// effects in secure mode. Also when the value was set with the P_INSECURE flag and is not // effects in secure mode. Also when the value was set with the kOptFlagInsecure flag and is not
// completely replaced. // completely replaced.
if ((opt_flags & OPT_MODELINE) || sandbox != 0 || (!value_replaced && (*p & P_INSECURE))) { if ((opt_flags & OPT_MODELINE) || sandbox != 0 || (!value_replaced && (*p & kOptFlagInsecure))) {
secure = 1; secure = 1;
} }
@@ -3719,7 +3720,7 @@ static const char *set_option(const OptIndex opt_idx, void *varp, OptVal value,
apply_optionset_autocmd(opt_idx, opt_flags, saved_used_value, saved_old_global_value, apply_optionset_autocmd(opt_idx, opt_flags, saved_used_value, saved_old_global_value,
saved_old_local_value, saved_new_value, errmsg); saved_old_local_value, saved_new_value, errmsg);
} }
if (opt->flags & P_UI_OPTION) { if (opt->flags & kOptFlagUIOption) {
ui_call_option_set(cstr_as_string(opt->fullname), optval_as_object(saved_new_value)); ui_call_option_set(cstr_as_string(opt->fullname), optval_as_object(saved_new_value));
} }
} }
@@ -3812,7 +3813,7 @@ const char *set_option_value(const OptIndex opt_idx, const OptVal value, int opt
uint32_t flags = options[opt_idx].flags; uint32_t flags = options[opt_idx].flags;
// Disallow changing some options in the sandbox // Disallow changing some options in the sandbox
if (sandbox > 0 && (flags & P_SECURE)) { if (sandbox > 0 && (flags & kOptFlagSecure)) {
return _(e_sandbox); return _(e_sandbox);
} }
@@ -4050,7 +4051,7 @@ OptVal get_option_value_strict(OptIndex opt_idx, OptReqScope req_scope, void *fr
/// Get option value for buffer / window. /// Get option value for buffer / window.
/// ///
/// @param opt_idx Option index in options[] table. /// @param opt_idx Option index in options[] table.
/// @param[out] flagsp Set to the option flags (P_xxxx) (if not NULL). /// @param[out] flagsp Set to the option flags (see OptFlags) (if not NULL).
/// @param[in] scope Option scope (can be OPT_LOCAL, OPT_GLOBAL or a combination). /// @param[in] scope Option scope (can be OPT_LOCAL, OPT_GLOBAL or a combination).
/// @param[out] hidden Whether option is hidden. /// @param[out] hidden Whether option is hidden.
/// @param req_scope Requested option scope. See OptReqScope in option.h. /// @param req_scope Requested option scope. See OptReqScope in option.h.
@@ -4227,7 +4228,7 @@ void ui_refresh_options(void)
{ {
for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) { for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) {
uint32_t flags = options[opt_idx].flags; uint32_t flags = options[opt_idx].flags;
if (!(flags & P_UI_OPTION)) { if (!(flags & kOptFlagUIOption)) {
continue; continue;
} }
String name = cstr_as_string(options[opt_idx].fullname); String name = cstr_as_string(options[opt_idx].fullname);
@@ -4302,14 +4303,14 @@ int makeset(FILE *fd, int opt_flags, int local_only)
// - Hidden options. // - Hidden options.
// //
// Do the loop over "options[]" twice: once for options with the // Do the loop over "options[]" twice: once for options with the
// P_PRI_MKRC flag and once without. // kOptFlagPriMkrc flag and once without.
for (int pri = 1; pri >= 0; pri--) { for (int pri = 1; pri >= 0; pri--) {
vimoption_T *opt; vimoption_T *opt;
for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) { for (OptIndex opt_idx = 0; opt_idx < kOptIndexCount; opt_idx++) {
opt = &options[opt_idx]; opt = &options[opt_idx];
if (!(opt->flags & P_NO_MKRC) if (!(opt->flags & kOptFlagNoMkrc)
&& ((pri == 1) == ((opt->flags & P_PRI_MKRC) != 0))) { && ((pri == 1) == ((opt->flags & kOptFlagPriMkrc) != 0))) {
// skip global option when only doing locals // skip global option when only doing locals
if (opt->indir == PV_NONE && !(opt_flags & OPT_GLOBAL)) { if (opt->indir == PV_NONE && !(opt_flags & OPT_GLOBAL)) {
continue; continue;
@@ -4317,7 +4318,7 @@ int makeset(FILE *fd, int opt_flags, int local_only)
// Do not store options like 'bufhidden' and 'syntax' in a vimrc // Do not store options like 'bufhidden' and 'syntax' in a vimrc
// file, they are always buffer-specific. // file, they are always buffer-specific.
if ((opt_flags & OPT_GLOBAL) && (opt->flags & P_NOGLOB)) { if ((opt_flags & OPT_GLOBAL) && (opt->flags & kOptFlagNoGlob)) {
continue; continue;
} }
@@ -4432,7 +4433,7 @@ static int put_setstring(FILE *fd, char *cmd, char *name, char **valuep, uint64_
char *part = NULL; char *part = NULL;
if (*valuep != NULL) { if (*valuep != NULL) {
if ((flags & P_EXPAND) != 0) { if ((flags & kOptFlagExpand) != 0) {
size_t size = (size_t)strlen(*valuep) + 1; size_t size = (size_t)strlen(*valuep) + 1;
// replace home directory in the whole option value into "buf" // replace home directory in the whole option value into "buf"
@@ -4442,7 +4443,7 @@ static int put_setstring(FILE *fd, char *cmd, char *name, char **valuep, uint64_
// If the option value is longer than MAXPATHL, we need to append // If the option value is longer than MAXPATHL, we need to append
// each comma separated part of the option separately, so that it // each comma separated part of the option separately, so that it
// can be expanded when read back. // can be expanded when read back.
if (size >= MAXPATHL && (flags & P_COMMA) != 0 if (size >= MAXPATHL && (flags & kOptFlagComma) != 0
&& vim_strchr(*valuep, ',') != NULL) { && vim_strchr(*valuep, ',') != NULL) {
part = xmalloc(size); part = xmalloc(size);
@@ -5574,8 +5575,8 @@ void set_context_in_set_cmd(expand_T *xp, char *arg, int opt_flags)
// Only string options below // Only string options below
// Options that have P_EXPAND are considered to all use file/dir expansion. // Options that have kOptFlagExpand are considered to all use file/dir expansion.
if (flags & P_EXPAND) { if (flags & kOptFlagExpand) {
p = options[opt_idx].var; p = options[opt_idx].var;
if (p == (char *)&p_bdir if (p == (char *)&p_bdir
|| p == (char *)&p_dir || p == (char *)&p_dir
@@ -5599,7 +5600,7 @@ void set_context_in_set_cmd(expand_T *xp, char *arg, int opt_flags)
xp->xp_backslash = XP_BS_ONE; xp->xp_backslash = XP_BS_ONE;
} }
} }
if (flags & P_COMMA) { if (flags & kOptFlagComma) {
xp->xp_backslash |= XP_BS_COMMA; xp->xp_backslash |= XP_BS_COMMA;
} }
} }
@@ -5609,21 +5610,21 @@ void set_context_in_set_cmd(expand_T *xp, char *arg, int opt_flags)
// pattern, while accounting for backslash-escaped space/commas/colons. // pattern, while accounting for backslash-escaped space/commas/colons.
// Triple-backslashed escaped file names (e.g. 'path') can also be // Triple-backslashed escaped file names (e.g. 'path') can also be
// delimited by space. // delimited by space.
if ((flags & P_EXPAND) || (flags & P_COMMA) || (flags & P_COLON)) { if ((flags & kOptFlagExpand) || (flags & kOptFlagComma) || (flags & kOptFlagColon)) {
for (p = argend - 1; p > xp->xp_pattern; p--) { for (p = argend - 1; p > xp->xp_pattern; p--) {
// count number of backslashes before ' ' or ',' // count number of backslashes before ' ' or ','
if (*p == ' ' || *p == ',' || (*p == ':' && (flags & P_COLON))) { if (*p == ' ' || *p == ',' || (*p == ':' && (flags & kOptFlagColon))) {
char *s = p; char *s = p;
while (s > xp->xp_pattern && *(s - 1) == '\\') { while (s > xp->xp_pattern && *(s - 1) == '\\') {
s--; s--;
} }
if ((*p == ' ' && ((xp->xp_backslash & XP_BS_THREE) && (p - s) < 3)) if ((*p == ' ' && ((xp->xp_backslash & XP_BS_THREE) && (p - s) < 3))
#if defined(BACKSLASH_IN_FILENAME) #if defined(BACKSLASH_IN_FILENAME)
|| (*p == ',' && (flags & P_COMMA) && (p - s) < 1) || (*p == ',' && (flags & kOptFlagComma) && (p - s) < 1)
#else #else
|| (*p == ',' && (flags & P_COMMA) && (p - s) < 2) || (*p == ',' && (flags & kOptFlagComma) && (p - s) < 2)
#endif #endif
|| (*p == ':' && (flags & P_COLON))) { || (*p == ':' && (flags & kOptFlagColon))) {
xp->xp_pattern = p + 1; xp->xp_pattern = p + 1;
break; break;
} }
@@ -5633,7 +5634,7 @@ void set_context_in_set_cmd(expand_T *xp, char *arg, int opt_flags)
// An option that is a list of single-character flags should always start // An option that is a list of single-character flags should always start
// at the end as we don't complete words. // at the end as we don't complete words.
if (flags & P_FLAGLIST) { if (flags & kOptFlagFlagList) {
xp->xp_pattern = argend; xp->xp_pattern = argend;
} }
@@ -5786,7 +5787,7 @@ static char *escape_option_str_cmdline(char *var)
for (var = buf; *var != NUL; MB_PTR_ADV(var)) { for (var = buf; *var != NUL; MB_PTR_ADV(var)) {
if (var[0] == '\\' && var[1] == '\\' if (var[0] == '\\' && var[1] == '\\'
&& expand_option_idx != kOptInvalid && expand_option_idx != kOptInvalid
&& (options[expand_option_idx].flags & P_EXPAND) && (options[expand_option_idx].flags & kOptFlagExpand)
&& vim_isfilec((uint8_t)var[2]) && vim_isfilec((uint8_t)var[2])
&& (var[2] != '\\' || (var == buf && var[4] != '\\'))) { && (var[2] != '\\' || (var == buf && var[4] != '\\'))) {
STRMOVE(var, var + 1); STRMOVE(var, var + 1);
@@ -5872,11 +5873,11 @@ int ExpandSettingSubtract(expand_T *xp, regmatch_T *regmatch, int *numMatches, c
if (option_has_type(expand_option_idx, kOptValTypeNumber)) { if (option_has_type(expand_option_idx, kOptValTypeNumber)) {
return ExpandOldSetting(numMatches, matches); return ExpandOldSetting(numMatches, matches);
} else if (option_flags & P_COMMA) { } else if (option_flags & kOptFlagComma) {
// Split the option by comma, then present each option to the user if // Split the option by comma, then present each option to the user if
// it matches the pattern. // it matches the pattern.
// This condition needs to go first, because 'whichwrap' has both // This condition needs to go first, because 'whichwrap' has both
// P_COMMA and P_FLAGLIST. // kOptFlagComma and kOptFlagFlagList.
if (*option_val == NUL) { if (*option_val == NUL) {
return FAIL; return FAIL;
@@ -5923,7 +5924,7 @@ int ExpandSettingSubtract(expand_T *xp, regmatch_T *regmatch, int *numMatches, c
*matches = ga.ga_data; *matches = ga.ga_data;
*numMatches = ga.ga_len; *numMatches = ga.ga_len;
return OK; return OK;
} else if (option_flags & P_FLAGLIST) { } else if (option_flags & kOptFlagFlagList) {
// Only present the flags that are set on the option as the other flags // Only present the flags that are set on the option as the other flags
// are not meaningful to do set-= on. // are not meaningful to do set-= on.
@@ -5988,7 +5989,7 @@ static void option_value2string(vimoption_T *opt, int scope)
varp = *(char **)(varp); varp = *(char **)(varp);
if (varp == NULL) { // Just in case. if (varp == NULL) { // Just in case.
NameBuff[0] = NUL; NameBuff[0] = NUL;
} else if (opt->flags & P_EXPAND) { } else if (opt->flags & kOptFlagExpand) {
home_replace(NULL, varp, NameBuff, MAXPATHL, false); home_replace(NULL, varp, NameBuff, MAXPATHL, false);
} else { } else {
xstrlcpy(NameBuff, varp, MAXPATHL); xstrlcpy(NameBuff, varp, MAXPATHL);
@@ -6049,7 +6050,7 @@ void vimrc_found(char *fname, char *envname)
bool option_was_set(OptIndex opt_idx) bool option_was_set(OptIndex opt_idx)
{ {
assert(opt_idx != kOptInvalid); assert(opt_idx != kOptInvalid);
return options[opt_idx].flags & P_WAS_SET; return options[opt_idx].flags & kOptFlagWasSet;
} }
/// Reset the flag indicating option "name" was set. /// Reset the flag indicating option "name" was set.
@@ -6058,7 +6059,7 @@ bool option_was_set(OptIndex opt_idx)
void reset_option_was_set(OptIndex opt_idx) void reset_option_was_set(OptIndex opt_idx)
{ {
assert(opt_idx != kOptInvalid); assert(opt_idx != kOptInvalid);
options[opt_idx].flags &= ~P_WAS_SET; options[opt_idx].flags &= ~(unsigned)kOptFlagWasSet;
} }
/// fill_culopt_flags() -- called when 'culopt' changes value /// fill_culopt_flags() -- called when 'culopt' changes value
@@ -6456,10 +6457,10 @@ static Dict vimoption2dict(vimoption_T *opt, int req_scope, buf_T *buf, win_T *w
// welcome to the jungle // welcome to the jungle
PUT_C(dict, "global_local", BOOLEAN_OBJ(opt->indir & PV_BOTH)); PUT_C(dict, "global_local", BOOLEAN_OBJ(opt->indir & PV_BOTH));
PUT_C(dict, "commalist", BOOLEAN_OBJ(opt->flags & P_COMMA)); PUT_C(dict, "commalist", BOOLEAN_OBJ(opt->flags & kOptFlagComma));
PUT_C(dict, "flaglist", BOOLEAN_OBJ(opt->flags & P_FLAGLIST)); PUT_C(dict, "flaglist", BOOLEAN_OBJ(opt->flags & kOptFlagFlagList));
PUT_C(dict, "was_set", BOOLEAN_OBJ(opt->flags & P_WAS_SET)); PUT_C(dict, "was_set", BOOLEAN_OBJ(opt->flags & kOptFlagWasSet));
LastSet last_set = { .channel_id = 0 }; LastSet last_set = { .channel_id = 0 };
if (req_scope == OPT_GLOBAL) { if (req_scope == OPT_GLOBAL) {
@@ -6483,7 +6484,7 @@ static Dict vimoption2dict(vimoption_T *opt, int req_scope, buf_T *buf, win_T *w
PUT_C(dict, "type", CSTR_AS_OBJ(optval_type_get_name(option_get_type(get_opt_idx(opt))))); PUT_C(dict, "type", CSTR_AS_OBJ(optval_type_get_name(option_get_type(get_opt_idx(opt)))));
PUT_C(dict, "default", optval_as_object(opt->def_val)); PUT_C(dict, "default", optval_as_object(opt->def_val));
PUT_C(dict, "allows_duplicates", BOOLEAN_OBJ(!(opt->flags & P_NODUP))); PUT_C(dict, "allows_duplicates", BOOLEAN_OBJ(!(opt->flags & kOptFlagNoDup)));
return dict; return dict;
} }

36
src/nvim/option_defs.h
View File

@@ -11,6 +11,40 @@
# include "options_enum.generated.h" # include "options_enum.generated.h"
#endif #endif
/// Option flags.
typedef enum {
kOptFlagExpand = 1 << 0, ///< Environment expansion.
///< NOTE: kOptFlagExpand can never be used for local or hidden options.
kOptFlagNoDefExp = 1 << 1, ///< Don't expand default value.
kOptFlagNoDefault = 1 << 2, ///< Don't set to default value.
kOptFlagWasSet = 1 << 3, ///< Option has been set/reset.
kOptFlagNoMkrc = 1 << 4, ///< Don't include in :mkvimrc output.
kOptFlagUIOption = 1 << 5, ///< Send option to remote UI.
kOptFlagRedrTabl = 1 << 6, ///< Redraw tabline.
kOptFlagRedrStat = 1 << 7, ///< Redraw status lines.
kOptFlagRedrWin = 1 << 8, ///< Redraw current window and recompute text.
kOptFlagRedrBuf = 1 << 9, ///< Redraw current buffer and recompute text.
kOptFlagRedrAll = kOptFlagRedrBuf | kOptFlagRedrWin, ///< Redraw all windows and recompute text.
kOptFlagRedrClear = kOptFlagRedrAll | kOptFlagRedrStat, ///< Clear and redraw all and recompute text.
kOptFlagComma = 1 << 10, ///< Comma-separated list.
kOptFlagOneComma = (1 << 11) | kOptFlagComma, ///< Comma-separated list that cannot have two consecutive commas.
kOptFlagNoDup = 1 << 12, ///< Don't allow duplicate strings.
kOptFlagFlagList = 1 << 13, ///< List of single-char flags.
kOptFlagSecure = 1 << 14, ///< Cannot change in modeline or secure mode.
kOptFlagGettext = 1 << 15, ///< Expand default value with _().
kOptFlagNoGlob = 1 << 16, ///< Do not use local value for global vimrc.
kOptFlagNFname = 1 << 17, ///< Only normal file name chars allowed.
kOptFlagInsecure = 1 << 18, ///< Option was set from a modeline.
kOptFlagPriMkrc = 1 << 19, ///< Priority for :mkvimrc (setting option has side effects).
kOptFlagNoML = 1 << 20, ///< Not allowed in modeline.
kOptFlagCurswant = 1 << 21, ///< Update curswant required; not needed when there is a redraw flag.
kOptFlagNDname = 1 << 22, ///< Only normal directory name chars allowed.
kOptFlagHLOnly = 1 << 23, ///< Option only changes highlight, not text.
kOptFlagMLE = 1 << 24, ///< Under control of 'modelineexpr'.
kOptFlagFunc = 1 << 25, ///< Accept a function reference or a lambda.
kOptFlagColon = 1 << 26, ///< Values use colons to create sublists.
} OptFlags;
/// Option value type. /// Option value type.
/// These types are also used as type flags by using the type value as an index for the type_flags /// These types are also used as type flags by using the type value as an index for the type_flags
/// bit field (@see option_has_type()). /// bit field (@see option_has_type()).
@@ -62,7 +96,7 @@ typedef struct {
/// New value of the option. /// New value of the option.
OptValData os_newval; OptValData os_newval;
/// Option value was checked to be safe, no need to set P_INSECURE /// Option value was checked to be safe, no need to set kOptFlagInsecure
/// Used for the 'keymap', 'filetype' and 'syntax' options. /// Used for the 'keymap', 'filetype' and 'syntax' options.
bool os_value_checked; bool os_value_checked;
/// Option value changed. Used for the 'filetype' and 'syntax' options. /// Option value changed. Used for the 'filetype' and 'syntax' options.

41
src/nvim/option_vars.h
View File

@@ -7,47 +7,6 @@
// option_vars.h: definition of global variables for settable options // option_vars.h: definition of global variables for settable options
// Option Flags
// #define P_ALLOCED 0x01U ///< Not used
#define P_EXPAND 0x02U ///< environment expansion. NOTE: P_EXPAND can
///< never be used for local or hidden options
#define P_NO_DEF_EXP 0x04U ///< do not expand default value
#define P_NODEFAULT 0x08U ///< don't set to default value
// #define P_DEF_ALLOCED 0x10U ///< Not used
#define P_WAS_SET 0x20U ///< option has been set/reset
#define P_NO_MKRC 0x40U ///< don't include in :mkvimrc output
// when option changed, what to display:
#define P_UI_OPTION 0x80U ///< send option to remote UI
#define P_RTABL 0x100U ///< redraw tabline
#define P_RSTAT 0x200U ///< redraw status lines
#define P_RWIN 0x400U ///< redraw current window and recompute text
#define P_RBUF 0x800U ///< redraw current buffer and recompute text
#define P_RALL 0xC00U ///< redraw all windows and recompute text
#define P_RCLR 0xE00U ///< clear and redraw all and recompute text
#define P_COMMA 0x1000U ///< comma separated list
#define P_ONECOMMA 0x3000U ///< P_COMMA and cannot have two consecutive
///< commas
#define P_NODUP 0x4000U ///< don't allow duplicate strings
#define P_FLAGLIST 0x8000U ///< list of single-char flags
#define P_SECURE 0x10000U ///< cannot change in modeline or secure mode
#define P_GETTEXT 0x20000U ///< expand default value with _()
#define P_NOGLOB 0x40000U ///< do not use local value for global vimrc
#define P_NFNAME 0x80000U ///< only normal file name chars allowed
#define P_INSECURE 0x100000U ///< option was set from a modeline
#define P_PRI_MKRC 0x200000U ///< priority for :mkvimrc (setting option
///< has side effects)
#define P_NO_ML 0x400000U ///< not allowed in modeline
#define P_CURSWANT 0x800000U ///< update curswant required; not needed
///< when there is a redraw flag
#define P_NDNAME 0x1000000U ///< only normal dir name chars allowed
#define P_HLONLY 0x2000000U ///< option only changes highlight, not text
#define P_MLE 0x4000000U ///< under control of 'modelineexpr'
#define P_FUNC 0x8000000U ///< accept a function reference or a lambda
#define P_COLON 0x10000000U ///< values use colons to create sublists
#define HIGHLIGHT_INIT \ #define HIGHLIGHT_INIT \
"8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText,d:Directory,e:ErrorMsg," \ "8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText,d:Directory,e:ErrorMsg," \
"i:IncSearch,l:Search,y:CurSearch,m:MoreMsg,M:ModeMsg,n:LineNr,a:LineNrAbove,b:LineNrBelow," \ "i:IncSearch,l:Search,y:CurSearch,m:MoreMsg,M:ModeMsg,n:LineNr,a:LineNrAbove,b:LineNrBelow," \

8
src/nvim/optionstr.c
View File

@@ -419,9 +419,9 @@ const char *check_stl_option(char *s)
/// often illegal in a file name. Be more permissive if "secure" is off. /// often illegal in a file name. Be more permissive if "secure" is off.
bool check_illegal_path_names(char *val, uint32_t flags) bool check_illegal_path_names(char *val, uint32_t flags)
{ {
return (((flags & P_NFNAME) return (((flags & kOptFlagNFname)
&& strpbrk(val, (secure ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL) && strpbrk(val, (secure ? "/\\*?[|;&<>\r\n" : "/\\*?[<>\r\n")) != NULL)
|| ((flags & P_NDNAME) || ((flags & kOptFlagNDname)
&& strpbrk(val, "*?[|;&<>\r\n") != NULL)); && strpbrk(val, "*?[|;&<>\r\n") != NULL));
} }
@@ -1377,7 +1377,7 @@ const char *did_set_filetype_or_syntax(optset_T *args)
args->os_value_changed = strcmp(args->os_oldval.string.data, *varp) != 0; args->os_value_changed = strcmp(args->os_oldval.string.data, *varp) != 0;
// Since we check the value, there is no need to set P_INSECURE, // Since we check the value, there is no need to set kOptFlagInsecure,
// even when the value comes from a modeline. // even when the value comes from a modeline.
args->os_value_checked = true; args->os_value_checked = true;
@@ -1658,7 +1658,7 @@ const char *did_set_keymap(optset_T *args)
secure = secure_save; secure = secure_save;
// Since we check the value, there is no need to set P_INSECURE, // Since we check the value, there is no need to set kOptFlagInsecure,
// even when the value comes from a modeline. // even when the value comes from a modeline.
args->os_value_checked = true; args->os_value_checked = true;