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

vim-patch:8.2.4753: error from setting an option is silently ignored (#19888)

Browse Source 
Problem:    Error from setting an option is silently ignored.
Solution:   Handle option value errors better.  Fix uses of N_().
31e5c60a68
This commit is contained in:
zeertzjq
2022-08-22 13:56:50 +08:00
committed by GitHub
parent d4d27c41b3
commit 2bed0d1d97
20 changed files with 112 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/buffer.c
View File

@@ -4189,8 +4189,8 @@ void buf_open_scratch(handle_T bufnr, char *bufname)
apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, false, curbuf); apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, false, curbuf);
(void)setfname(curbuf, bufname, NULL, true); (void)setfname(curbuf, bufname, NULL, true);
apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, curbuf); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, curbuf);
set_option_value("bh", 0L, "hide", OPT_LOCAL); set_option_value_give_err("bh", 0L, "hide", OPT_LOCAL);
set_option_value("bt", 0L, "nofile", OPT_LOCAL); set_option_value_give_err("bt", 0L, "nofile", OPT_LOCAL);
set_option_value("swf", 0L, NULL, OPT_LOCAL); set_option_value_give_err("swf", 0L, NULL, OPT_LOCAL);
RESET_BINDING(curwin); RESET_BINDING(curwin);
} }

2
src/nvim/diff.c
View File

@@ -1374,7 +1374,7 @@ static void set_diff_option(win_T *wp, int value)
curwin = wp; curwin = wp;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
curbuf->b_ro_locked++; curbuf->b_ro_locked++;
set_option_value("diff", (long)value, NULL, OPT_LOCAL); set_option_value_give_err("diff", (long)value, NULL, OPT_LOCAL);
curbuf->b_ro_locked--; curbuf->b_ro_locked--;
curwin = old_curwin; curwin = old_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;

2
src/nvim/eval.c
View File

@@ -8392,7 +8392,7 @@ char *do_string_sub(char *str, char *pat, char *sub, typval_T *expr, char *flags
// If it's still empty it was changed and restored, need to restore in // If it's still empty it was changed and restored, need to restore in
// the complicated way. // the complicated way.
if (*p_cpo == NUL) { if (*p_cpo == NUL) {
set_option_value("cpo", 0L, save_cpo, 0); set_option_value_give_err("cpo", 0L, save_cpo, 0);
} }
free_string_option((char_u *)save_cpo); free_string_option((char_u *)save_cpo);
} }

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

@@ -7416,7 +7416,7 @@ long do_searchpair(const char *spat, const char *mpat, const char *epat, int dir
// If it's still empty it was changed and restored, need to restore in // If it's still empty it was changed and restored, need to restore in
// the complicated way. // the complicated way.
if (*p_cpo == NUL) { if (*p_cpo == NUL) {
set_option_value("cpo", 0L, save_cpo, 0); set_option_value_give_err("cpo", 0L, save_cpo, 0);
} }
free_string_option((char_u *)save_cpo); free_string_option((char_u *)save_cpo);
} }

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

@@ -1627,7 +1627,7 @@ static void set_option_from_tv(const char *varname, typval_T *varp)
strval = tv_get_string_buf_chk(varp, nbuf); strval = tv_get_string_buf_chk(varp, nbuf);
} }
if (!error && strval != NULL) { if (!error && strval != NULL) {
set_option_value(varname, numval, strval, OPT_LOCAL); set_option_value_give_err(varname, numval, strval, OPT_LOCAL);
} }
} }

12
src/nvim/ex_cmds2.c
View File

@@ -544,9 +544,9 @@ void ex_listdo(exarg_T *eap)
// Clear 'shm' to avoid that the file message overwrites // Clear 'shm' to avoid that the file message overwrites
// any output from the command. // any output from the command.
p_shm_save = (char *)vim_strsave(p_shm); p_shm_save = (char *)vim_strsave(p_shm);
set_option_value("shm", 0L, "", 0); set_option_value_give_err("shm", 0L, "", 0);
do_argfile(eap, i); do_argfile(eap, i);
set_option_value("shm", 0L, p_shm_save, 0); set_option_value_give_err("shm", 0L, p_shm_save, 0);
xfree(p_shm_save); xfree(p_shm_save);
} }
if (curwin->w_arg_idx != i) { if (curwin->w_arg_idx != i) {
@@ -613,9 +613,9 @@ void ex_listdo(exarg_T *eap)
// Go to the next buffer. Clear 'shm' to avoid that the file // Go to the next buffer. Clear 'shm' to avoid that the file
// message overwrites any output from the command. // message overwrites any output from the command.
p_shm_save = (char *)vim_strsave(p_shm); p_shm_save = (char *)vim_strsave(p_shm);
set_option_value("shm", 0L, "", 0); set_option_value_give_err("shm", 0L, "", 0);
goto_buffer(eap, DOBUF_FIRST, FORWARD, next_fnum); goto_buffer(eap, DOBUF_FIRST, FORWARD, next_fnum);
set_option_value("shm", 0L, p_shm_save, 0); set_option_value_give_err("shm", 0L, p_shm_save, 0);
xfree(p_shm_save); xfree(p_shm_save);
// If autocommands took us elsewhere, quit here. // If autocommands took us elsewhere, quit here.
@@ -636,9 +636,9 @@ void ex_listdo(exarg_T *eap)
// Clear 'shm' to avoid that the file message overwrites // Clear 'shm' to avoid that the file message overwrites
// any output from the command. // any output from the command.
p_shm_save = (char *)vim_strsave(p_shm); p_shm_save = (char *)vim_strsave(p_shm);
set_option_value("shm", 0L, "", 0); set_option_value_give_err("shm", 0L, "", 0);
ex_cnext(eap); ex_cnext(eap);
set_option_value("shm", 0L, p_shm_save, 0); set_option_value_give_err("shm", 0L, p_shm_save, 0);
xfree(p_shm_save); xfree(p_shm_save);
// If jumping to the next quickfix entry fails, quit here. // If jumping to the next quickfix entry fails, quit here.

18
src/nvim/ex_docmd.c
View File

@@ -6945,15 +6945,15 @@ void dialog_msg(char *buff, char *format, char *fname)
static void ex_behave(exarg_T *eap) static void ex_behave(exarg_T *eap)
{ {
if (STRCMP(eap->arg, "mswin") == 0) { if (STRCMP(eap->arg, "mswin") == 0) {
set_option_value("selection", 0L, "exclusive", 0); set_option_value_give_err("selection", 0L, "exclusive", 0);
set_option_value("selectmode", 0L, "mouse,key", 0); set_option_value_give_err("selectmode", 0L, "mouse,key", 0);
set_option_value("mousemodel", 0L, "popup", 0); set_option_value_give_err("mousemodel", 0L, "popup", 0);
set_option_value("keymodel", 0L, "startsel,stopsel", 0); set_option_value_give_err("keymodel", 0L, "startsel,stopsel", 0);
} else if (STRCMP(eap->arg, "xterm") == 0) { } else if (STRCMP(eap->arg, "xterm") == 0) {
set_option_value("selection", 0L, "inclusive", 0); set_option_value_give_err("selection", 0L, "inclusive", 0);
set_option_value("selectmode", 0L, "", 0); set_option_value_give_err("selectmode", 0L, "", 0);
set_option_value("mousemodel", 0L, "extend", 0); set_option_value_give_err("mousemodel", 0L, "extend", 0);
set_option_value("keymodel", 0L, "", 0); set_option_value_give_err("keymodel", 0L, "", 0);
} else { } else {
semsg(_(e_invarg2), eap->arg); semsg(_(e_invarg2), eap->arg);
} }
@@ -7073,7 +7073,7 @@ static void ex_setfiletype(exarg_T *eap)
arg += 9; arg += 9;
} }
set_option_value("filetype", 0L, arg, OPT_LOCAL); set_option_value_give_err("filetype", 0L, arg, OPT_LOCAL);
if (arg != eap->arg) { if (arg != eap->arg) {
did_filetype = false; did_filetype = false;
} }

4
src/nvim/ex_getln.c
View File

@@ -4074,7 +4074,7 @@ static int open_cmdwin(void)
// Create empty command-line buffer. // Create empty command-line buffer.
buf_open_scratch(0, _("[Command Line]")); buf_open_scratch(0, _("[Command Line]"));
// Command-line buffer has bufhidden=wipe, unlike a true "scratch" buffer. // Command-line buffer has bufhidden=wipe, unlike a true "scratch" buffer.
set_option_value("bh", 0L, "wipe", OPT_LOCAL); set_option_value_give_err("bh", 0L, "wipe", OPT_LOCAL);
curwin->w_p_rl = cmdmsg_rl; curwin->w_p_rl = cmdmsg_rl;
cmdmsg_rl = false; cmdmsg_rl = false;
curbuf->b_p_ma = true; curbuf->b_p_ma = true;
@@ -4092,7 +4092,7 @@ static int open_cmdwin(void)
add_map("<Tab>", "<C-X><C-V>", MODE_INSERT, true); add_map("<Tab>", "<C-X><C-V>", MODE_INSERT, true);
add_map("<Tab>", "a<C-X><C-V>", MODE_NORMAL, true); add_map("<Tab>", "a<C-X><C-V>", MODE_NORMAL, true);
} }
set_option_value("ft", 0L, "vim", OPT_LOCAL); set_option_value_give_err("ft", 0L, "vim", OPT_LOCAL);
} }
curbuf->b_ro_locked--; curbuf->b_ro_locked--;

2
src/nvim/getchar.c
View File

@@ -2112,7 +2112,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
} }
del_typebuf(mlen, 0); // remove the chars del_typebuf(mlen, 0); // remove the chars
set_option_value("paste", !p_paste, NULL, 0); set_option_value_give_err("paste", !p_paste, NULL, 0);
if (!(State & MODE_INSERT)) { if (!(State & MODE_INSERT)) {
msg_col = 0; msg_col = 0;
msg_row = Rows - 1; msg_row = Rows - 1;

2
src/nvim/help.c
View File

@@ -652,7 +652,7 @@ void fix_help_buffer(void)
// Set filetype to "help". // Set filetype to "help".
if (STRCMP(curbuf->b_p_ft, "help") != 0) { if (STRCMP(curbuf->b_p_ft, "help") != 0) {
curbuf->b_ro_locked++; curbuf->b_ro_locked++;
set_option_value("ft", 0L, "help", OPT_LOCAL); set_option_value_give_err("ft", 0L, "help", OPT_LOCAL);
curbuf->b_ro_locked--; curbuf->b_ro_locked--;
} }

2
src/nvim/highlight_group.c
View File

@@ -1156,7 +1156,7 @@ void do_highlight(const char *line, const bool forceit, const bool init)
if (dark != -1 if (dark != -1
&& dark != (*p_bg == 'd') && dark != (*p_bg == 'd')
&& !option_was_set("bg")) { && !option_was_set("bg")) {
set_option_value("bg", 0L, (dark ? "dark" : "light"), 0); set_option_value_give_err("bg", 0L, (dark ? "dark" : "light"), 0);
reset_option_was_set("bg"); reset_option_was_set("bg");
} }
} }

20
src/nvim/main.c
View File

@@ -1052,7 +1052,7 @@ static void command_line_scan(mparm_T *parmp)
} else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) { } else if (STRNICMP(argv[0] + argv_idx, "clean", 5) == 0) {
parmp->use_vimrc = "NONE"; parmp->use_vimrc = "NONE";
parmp->clean = true; parmp->clean = true;
set_option_value("shadafile", 0L, "NONE", 0); set_option_value_give_err("shadafile", 0L, "NONE", 0);
} else if (STRNICMP(argv[0] + argv_idx, "luamod-dev", 9) == 0) { } else if (STRNICMP(argv[0] + argv_idx, "luamod-dev", 9) == 0) {
nlua_disable_preload = true; nlua_disable_preload = true;
} else { } else {
@@ -1066,7 +1066,7 @@ static void command_line_scan(mparm_T *parmp)
} }
break; break;
case 'A': // "-A" start in Arabic mode. case 'A': // "-A" start in Arabic mode.
set_option_value("arabic", 1L, NULL, 0); set_option_value_give_err("arabic", 1L, NULL, 0);
break; break;
case 'b': // "-b" binary mode. case 'b': // "-b" binary mode.
// Needs to be effective before expanding file names, because // Needs to be effective before expanding file names, because
@@ -1097,10 +1097,10 @@ static void command_line_scan(mparm_T *parmp)
os_exit(0); os_exit(0);
case 'H': // "-H" start in Hebrew mode: rl + hkmap set. case 'H': // "-H" start in Hebrew mode: rl + hkmap set.
p_hkmap = true; p_hkmap = true;
set_option_value("rl", 1L, NULL, 0); set_option_value_give_err("rl", 1L, NULL, 0);
break; break;
case 'l': // "-l" lisp mode, 'lisp' and 'showmatch' on. case 'l': // "-l" lisp mode, 'lisp' and 'showmatch' on.
set_option_value("lisp", 1L, NULL, 0); set_option_value_give_err("lisp", 1L, NULL, 0);
p_sm = true; p_sm = true;
break; break;
case 'M': // "-M" no changes or writing of files case 'M': // "-M" no changes or writing of files
@@ -1181,7 +1181,7 @@ static void command_line_scan(mparm_T *parmp)
// default is 10: a little bit verbose // default is 10: a little bit verbose
p_verbose = get_number_arg(argv[0], &argv_idx, 10); p_verbose = get_number_arg(argv[0], &argv_idx, 10);
if (argv[0][argv_idx] != NUL) { if (argv[0][argv_idx] != NUL) {
set_option_value("verbosefile", 0L, argv[0] + argv_idx, 0); set_option_value_give_err("verbosefile", 0L, argv[0] + argv_idx, 0);
argv_idx = (int)STRLEN(argv[0]); argv_idx = (int)STRLEN(argv[0]);
} }
break; break;
@@ -1189,7 +1189,7 @@ static void command_line_scan(mparm_T *parmp)
// "-w {scriptout}" write to script // "-w {scriptout}" write to script
if (ascii_isdigit(((char_u *)argv[0])[argv_idx])) { if (ascii_isdigit(((char_u *)argv[0])[argv_idx])) {
n = get_number_arg(argv[0], &argv_idx, 10); n = get_number_arg(argv[0], &argv_idx, 10);
set_option_value("window", n, NULL, 0); set_option_value_give_err("window", n, NULL, 0);
break; break;
} }
want_argument = true; want_argument = true;
@@ -1284,7 +1284,7 @@ static void command_line_scan(mparm_T *parmp)
break; break;
case 'i': // "-i {shada}" use for shada case 'i': // "-i {shada}" use for shada
set_option_value("shadafile", 0L, argv[0], 0); set_option_value_give_err("shadafile", 0L, argv[0], 0);
break; break;
case 's': { // "-s {scriptin}" read from script file case 's': { // "-s {scriptin}" read from script file
@@ -1334,7 +1334,7 @@ scripterror:
if (ascii_isdigit(*((char_u *)argv[0]))) { if (ascii_isdigit(*((char_u *)argv[0]))) {
argv_idx = 0; argv_idx = 0;
n = get_number_arg(argv[0], &argv_idx, 10); n = get_number_arg(argv[0], &argv_idx, 10);
set_option_value("window", n, NULL, 0); set_option_value_give_err("window", n, NULL, 0);
argv_idx = -1; argv_idx = -1;
break; break;
} }
@@ -1735,7 +1735,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
p_shm_save = xstrdup((char *)p_shm); p_shm_save = xstrdup((char *)p_shm);
snprintf(buf, sizeof(buf), "F%s", p_shm); snprintf(buf, sizeof(buf), "F%s", p_shm);
set_option_value("shm", 0L, buf, 0); set_option_value_give_err("shm", 0L, buf, 0);
} }
} else { } else {
if (curwin->w_next == NULL) { // just checking if (curwin->w_next == NULL) { // just checking
@@ -1779,7 +1779,7 @@ static void edit_buffers(mparm_T *parmp, char_u *cwd)
} }
if (p_shm_save != NULL) { if (p_shm_save != NULL) {
set_option_value("shm", 0L, p_shm_save, 0); set_option_value_give_err("shm", 0L, p_shm_save, 0);
xfree(p_shm_save); xfree(p_shm_save);
} }

2
src/nvim/memline.c
View File

@@ -993,7 +993,7 @@ void ml_recover(bool checkext)
set_fileformat(b0_ff - 1, OPT_LOCAL); set_fileformat(b0_ff - 1, OPT_LOCAL);
} }
if (b0_fenc != NULL) { if (b0_fenc != NULL) {
set_option_value("fenc", 0L, (char *)b0_fenc, OPT_LOCAL); set_option_value_give_err("fenc", 0L, (char *)b0_fenc, OPT_LOCAL);
xfree(b0_fenc); xfree(b0_fenc);
} }
unchanged(curbuf, true, true); unchanged(curbuf, true, true);

57
src/nvim/option.c
View File

@@ -91,6 +91,19 @@
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/lang.h" #include "nvim/os/lang.h"
static char e_unknown_option[]
= N_("E518: Unknown option");
static char e_not_allowed_in_modeline[]
= N_("E520: Not allowed in a modeline");
static char e_not_allowed_in_modeline_when_modelineexpr_is_off[]
= N_("E992: Not allowed in a modeline when 'modelineexpr' is off");
static char e_key_code_not_set[]
= N_("E846: Key code not set");
static char e_number_required_after_equal[]
= N_("E521: Number required after =");
static char e_preview_window_already_exists[]
= N_("E590: A preview window already exists");
/* /*
* The options that are local to a window or buffer have "indir" set to one of * The options that are local to a window or buffer have "indir" set to one of
* these values. Special values: * these values. Special values:
@@ -404,7 +417,7 @@ void set_init_1(bool clean_arg)
// NOTE: mlterm's author is being asked to 'set' a variable // NOTE: mlterm's author is being asked to 'set' a variable
// instead of an environment variable due to inheritance. // instead of an environment variable due to inheritance.
if (os_env_exists("MLTERM")) { if (os_env_exists("MLTERM")) {
set_option_value("tbidi", 1L, NULL, 0); set_option_value_give_err("tbidi", 1L, NULL, 0);
} }
didset_options2(); didset_options2();
@@ -915,7 +928,7 @@ int do_set(char *arg, int opt_flags)
nextchar = (uint8_t)arg[len]; nextchar = (uint8_t)arg[len];
if (opt_idx == -1 && key == 0) { // found a mismatch: skip if (opt_idx == -1 && key == 0) { // found a mismatch: skip
errmsg = N_("E518: Unknown option"); errmsg = e_unknown_option;
goto skip; goto skip;
} }
@@ -926,7 +939,7 @@ int do_set(char *arg, int opt_flags)
if (vim_strchr("=:!&<", nextchar) == NULL if (vim_strchr("=:!&<", nextchar) == NULL
&& (!(options[opt_idx].flags & P_BOOL) && (!(options[opt_idx].flags & P_BOOL)
|| nextchar == '?')) { || nextchar == '?')) {
errmsg = _(e_unsupportedoption); errmsg = e_unsupportedoption;
} }
goto skip; goto skip;
} }
@@ -953,11 +966,11 @@ int do_set(char *arg, int opt_flags)
// 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 & (P_SECURE | P_NO_ML)) {
errmsg = N_("E520: Not allowed in a modeline"); errmsg = e_not_allowed_in_modeline;
goto skip; goto skip;
} }
if ((flags & P_MLE) && !p_mle) { if ((flags & P_MLE) && !p_mle) {
errmsg = N_("E992: Not allowed in a modeline when 'modelineexpr' is off"); errmsg = e_not_allowed_in_modeline_when_modelineexpr_is_off;
goto skip; goto skip;
} }
// In diff mode some options are overruled. This avoids that // In diff mode some options are overruled. This avoids that
@@ -1025,7 +1038,7 @@ int do_set(char *arg, int opt_flags)
} }
} }
} else { } else {
errmsg = N_("E846: Key code not set"); errmsg = e_key_code_not_set;
goto skip; goto skip;
} }
if (nextchar != '?' if (nextchar != '?'
@@ -1118,11 +1131,11 @@ int do_set(char *arg, int opt_flags)
// Allow negative, octal and hex numbers. // Allow negative, octal and hex numbers.
vim_str2nr((char_u *)arg, NULL, &i, STR2NR_ALL, &value, NULL, 0, true); vim_str2nr((char_u *)arg, NULL, &i, STR2NR_ALL, &value, NULL, 0, true);
if (i == 0 || (arg[i] != NUL && !ascii_iswhite(arg[i]))) { if (i == 0 || (arg[i] != NUL && !ascii_iswhite(arg[i]))) {
errmsg = N_("E521: Number required after ="); errmsg = e_number_required_after_equal;
goto skip; goto skip;
} }
} else { } else {
errmsg = N_("E521: Number required after ="); errmsg = e_number_required_after_equal;
goto skip; goto skip;
} }
@@ -1971,6 +1984,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
{ {
int old_value = *(int *)varp; int old_value = *(int *)varp;
int old_global_value = 0; int old_global_value = 0;
char *errmsg = NULL;
// Disallow changing some options from secure mode // Disallow changing some options from secure mode
if ((secure || sandbox != 0) if ((secure || sandbox != 0)
@@ -2092,7 +2106,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
FOR_ALL_WINDOWS_IN_TAB(win, curtab) { FOR_ALL_WINDOWS_IN_TAB(win, curtab) {
if (win->w_p_pvw && win != curwin) { if (win->w_p_pvw && win != curwin) {
curwin->w_p_pvw = false; curwin->w_p_pvw = false;
return N_("E590: A preview window already exists"); return e_preview_window_already_exists;
} }
} }
} }
@@ -2151,10 +2165,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
} }
} else if ((int *)varp == &curwin->w_p_spell) { // 'spell' } else if ((int *)varp == &curwin->w_p_spell) { // 'spell'
if (curwin->w_p_spell) { if (curwin->w_p_spell) {
char *errmsg = did_set_spelllang(curwin); errmsg = did_set_spelllang(curwin);
if (errmsg != NULL) {
emsg(_(errmsg));
}
} }
} }
@@ -2191,7 +2202,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
p_deco = true; p_deco = true;
// Force-set the necessary keymap for arabic. // Force-set the necessary keymap for arabic.
set_option_value("keymap", 0L, "arabic", OPT_LOCAL); errmsg = set_option_value("keymap", 0L, "arabic", OPT_LOCAL);
} else { } else {
/* /*
* 'arabic' is reset, handle various sub-settings. * 'arabic' is reset, handle various sub-settings.
@@ -2271,7 +2282,7 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
} }
check_redraw(options[opt_idx].flags); check_redraw(options[opt_idx].flags);
return NULL; return errmsg;
} }
/// Set the value of a number option, taking care of side effects /// Set the value of a number option, taking care of side effects
@@ -2898,7 +2909,7 @@ void set_tty_background(const char *value)
? "autocmd VimEnter * ++once ++nested set bg=light" ? "autocmd VimEnter * ++once ++nested set bg=light"
: "autocmd VimEnter * ++once ++nested set bg=dark"); : "autocmd VimEnter * ++once ++nested set bg=dark");
} else { } else {
set_option_value("bg", 0L, value, 0); set_option_value_give_err("bg", 0L, value, 0);
reset_option_was_set("bg"); reset_option_was_set("bg");
} }
} }
@@ -3147,7 +3158,7 @@ bool is_hidden_option(int opt_idx)
/// is cleared (the exact semantics of this depend /// is cleared (the exact semantics of this depend
/// on the option). /// on the option).
/// ///
/// @return NULL on success, error message on error. /// @return NULL on success, an untranslated error message on error.
char *set_option_value(const char *const name, const long number, const char *const string, char *set_option_value(const char *const name, const long number, const char *const string,
const int opt_flags) const int opt_flags)
FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(1)
@@ -3217,6 +3228,18 @@ char *set_option_value(const char *const name, const long number, const char *co
return NULL; return NULL;
} }
/// Call set_option_value() and when an error is returned report it.
///
/// @param opt_flags OPT_LOCAL or 0 (both)
void set_option_value_give_err(const char *name, long number, const char *string, int opt_flags)
{
char *errmsg = set_option_value(name, number, string, opt_flags);
if (errmsg != NULL) {
emsg(_(errmsg));
}
}
/// Return true if "name" is a string option. /// Return true if "name" is a string option.
/// Returns false if option "name" does not exist. /// Returns false if option "name" does not exist.
bool is_string_option(const char *name) bool is_string_option(const char *name)

28
src/nvim/optionstr.c
View File

@@ -45,8 +45,14 @@
# include "optionstr.c.generated.h" # include "optionstr.c.generated.h"
#endif #endif
static char e_unclosed_expression_sequence[] = N_("E540: Unclosed expression sequence"); static char e_unclosed_expression_sequence[]
static char e_unbalanced_groups[] = N_("E542: unbalanced groups"); = N_("E540: Unclosed expression sequence");
static char e_unbalanced_groups[]
= N_("E542: unbalanced groups");
static char e_backupext_and_patchmode_are_equal[]
= N_("E589: 'backupext' and 'patchmode' are equal");
static char e_showbreak_contains_unprintable_or_wide_character[]
= N_("E595: 'showbreak' contains unprintable or wide character");
static char *(p_ambw_values[]) = { "single", "double", NULL }; static char *(p_ambw_values[]) = { "single", "double", NULL };
static char *(p_bg_values[]) = { "light", "dark", NULL }; static char *(p_bg_values[]) = { "light", "dark", NULL };
@@ -381,7 +387,7 @@ void set_string_option_direct_in_win(win_T *wp, const char *name, int opt_idx, c
/// @param[in] opt_flags Option flags: expected to contain #OPT_LOCAL and/or /// @param[in] opt_flags Option flags: expected to contain #OPT_LOCAL and/or
/// #OPT_GLOBAL. /// #OPT_GLOBAL.
/// ///
/// @return NULL on success, error message on error. /// @return NULL on success, an untranslated error message on error.
char *set_string_option(const int opt_idx, const char *const value, const int opt_flags) char *set_string_option(const int opt_idx, const char *const value, const int opt_flags)
FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_WARN_UNUSED_RESULT
{ {
@@ -413,15 +419,15 @@ char *set_string_option(const int opt_idx, const char *const value, const int op
char *const saved_newval = xstrdup(s); char *const saved_newval = xstrdup(s);
int value_checked = false; int value_checked = false;
char *const r = did_set_string_option(opt_idx, (char_u **)varp, (char_u *)oldval, char *const errmsg = did_set_string_option(opt_idx, (char_u **)varp, (char_u *)oldval,
NULL, 0, NULL, 0,
opt_flags, &value_checked); opt_flags, &value_checked);
if (r == NULL) { if (errmsg == NULL) {
did_set_option(opt_idx, opt_flags, true, value_checked); did_set_option(opt_idx, opt_flags, true, value_checked);
} }
// call autocommand after handling side effects // call autocommand after handling side effects
if (r == NULL) { if (errmsg == NULL) {
if (!starting) { if (!starting) {
trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g, trigger_optionsset_string(opt_idx, opt_flags, saved_oldval, saved_oldval_l, saved_oldval_g,
saved_newval); saved_newval);
@@ -436,7 +442,7 @@ char *set_string_option(const int opt_idx, const char *const value, const int op
xfree(saved_oldval_g); xfree(saved_oldval_g);
xfree(saved_newval); xfree(saved_newval);
return r; return errmsg;
} }
/// Return true if "val" is a valid 'filetype' name. /// Return true if "val" is a valid 'filetype' name.
@@ -679,7 +685,7 @@ char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char *er
} else if (varp == &p_bex || varp == &p_pm) { // 'backupext' and 'patchmode' } else if (varp == &p_bex || varp == &p_pm) { // 'backupext' and 'patchmode'
if (STRCMP(*p_bex == '.' ? p_bex + 1 : p_bex, if (STRCMP(*p_bex == '.' ? p_bex + 1 : p_bex,
*p_pm == '.' ? p_pm + 1 : p_pm) == 0) { *p_pm == '.' ? p_pm + 1 : p_pm) == 0) {
errmsg = N_("E589: 'backupext' and 'patchmode' are equal"); errmsg = e_backupext_and_patchmode_are_equal;
} }
} else if (varp == &curwin->w_p_briopt) { // 'breakindentopt' } else if (varp == &curwin->w_p_briopt) { // 'breakindentopt'
if (briopt_check(curwin) == FAIL) { if (briopt_check(curwin) == FAIL) {
@@ -1041,7 +1047,7 @@ char *did_set_string_option(int opt_idx, char_u **varp, char_u *oldval, char *er
} else if (gvarp == &p_sbr) { // 'showbreak' } else if (gvarp == &p_sbr) { // 'showbreak'
for (s = (char *)(*varp); *s;) { for (s = (char *)(*varp); *s;) {
if (ptr2cells(s) != 1) { if (ptr2cells(s) != 1) {
errmsg = N_("E595: 'showbreak' contains unprintable or wide character"); errmsg = e_showbreak_contains_unprintable_or_wide_character;
} }
MB_PTR_ADV(s); MB_PTR_ADV(s);
} }

10
src/nvim/popupmenu.c
View File

@@ -744,11 +744,11 @@ static bool pum_set_selected(int n, int repeat)
if (res == OK) { if (res == OK) {
// Edit a new, empty buffer. Set options for a "wipeout" // Edit a new, empty buffer. Set options for a "wipeout"
// buffer. // buffer.
set_option_value("swf", 0L, NULL, OPT_LOCAL); set_option_value_give_err("swf", 0L, NULL, OPT_LOCAL);
set_option_value("bl", 0L, NULL, OPT_LOCAL); set_option_value_give_err("bl", 0L, NULL, OPT_LOCAL);
set_option_value("bt", 0L, "nofile", OPT_LOCAL); set_option_value_give_err("bt", 0L, "nofile", OPT_LOCAL);
set_option_value("bh", 0L, "wipe", OPT_LOCAL); set_option_value_give_err("bh", 0L, "wipe", OPT_LOCAL);
set_option_value("diff", 0L, NULL, OPT_LOCAL); set_option_value_give_err("diff", 0L, NULL, OPT_LOCAL);
} }
} }

12
src/nvim/quickfix.c
View File

@@ -3558,12 +3558,12 @@ static int qf_goto_cwindow(const qf_info_T *qi, bool resize, int sz, bool vertsp
static void qf_set_cwindow_options(void) static void qf_set_cwindow_options(void)
{ {
// switch off 'swapfile' // switch off 'swapfile'
set_option_value("swf", 0L, NULL, OPT_LOCAL); set_option_value_give_err("swf", 0L, NULL, OPT_LOCAL);
set_option_value("bt", 0L, "quickfix", OPT_LOCAL); set_option_value_give_err("bt", 0L, "quickfix", OPT_LOCAL);
set_option_value("bh", 0L, "hide", OPT_LOCAL); set_option_value_give_err("bh", 0L, "hide", OPT_LOCAL);
RESET_BINDING(curwin); RESET_BINDING(curwin);
curwin->w_p_diff = false; curwin->w_p_diff = false;
set_option_value("fdm", 0L, "manual", OPT_LOCAL); set_option_value_give_err("fdm", 0L, "manual", OPT_LOCAL);
} }
// Open a new quickfix or location list window, load the quickfix buffer and // Open a new quickfix or location list window, load the quickfix buffer and
@@ -4108,7 +4108,7 @@ static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last, int q
// resembles reading a file into a buffer, it's more logical when using // resembles reading a file into a buffer, it's more logical when using
// autocommands. // autocommands.
curbuf->b_ro_locked++; curbuf->b_ro_locked++;
set_option_value("ft", 0L, "qf", OPT_LOCAL); set_option_value_give_err("ft", 0L, "qf", OPT_LOCAL);
curbuf->b_p_ma = false; curbuf->b_p_ma = false;
keep_filetype = true; // don't detect 'filetype' keep_filetype = true; // don't detect 'filetype'
@@ -7102,7 +7102,7 @@ void ex_helpgrep(exarg_T *eap)
// Darn, some plugin changed the value. If it's still empty it was // Darn, some plugin changed the value. If it's still empty it was
// changed and restored, need to restore in the complicated way. // changed and restored, need to restore in the complicated way.
if (*p_cpo == NUL) { if (*p_cpo == NUL) {
set_option_value("cpo", 0L, save_cpo, 0); set_option_value_give_err("cpo", 0L, save_cpo, 0);
} }
free_string_option((char_u *)save_cpo); free_string_option((char_u *)save_cpo);
} }

2
src/nvim/runtime.c
View File

@@ -923,7 +923,7 @@ static int add_pack_dir_to_rtp(char_u *fname, bool is_pack)
xstrlcat(new_rtp, afterdir, new_rtp_capacity); xstrlcat(new_rtp, afterdir, new_rtp_capacity);
} }
set_option_value("rtp", 0L, new_rtp, 0); set_option_value_give_err("rtp", 0L, new_rtp, 0);
xfree(new_rtp); xfree(new_rtp);
retval = OK; retval = OK;

8
src/nvim/spell.c
View File

@@ -1828,8 +1828,8 @@ static int count_syllables(slang_T *slang, const char_u *word)
return cnt; return cnt;
} }
// Parse 'spelllang' and set w_s->b_langp accordingly. /// Parse 'spelllang' and set w_s->b_langp accordingly.
// Returns NULL if it's OK, an error message otherwise. /// @return NULL if it's OK, an untranslated error message otherwise.
char *did_set_spelllang(win_T *wp) char *did_set_spelllang(win_T *wp)
{ {
garray_T ga; garray_T ga;
@@ -3155,8 +3155,8 @@ void ex_spelldump(exarg_T *eap)
do_cmdline_cmd("new"); do_cmdline_cmd("new");
// enable spelling locally in the new window // enable spelling locally in the new window
set_option_value("spell", true, "", OPT_LOCAL); set_option_value_give_err("spell", true, "", OPT_LOCAL);
set_option_value("spl", dummy, spl, OPT_LOCAL); set_option_value_give_err("spl", dummy, spl, OPT_LOCAL);
xfree(spl); xfree(spl);
if (!buf_is_empty(curbuf)) { if (!buf_is_empty(curbuf)) {

2
src/nvim/spellfile.c
View File

@@ -5735,7 +5735,7 @@ static void init_spellfile(void)
&& strstr(path_tail((char *)fname), ".ascii.") != NULL) && strstr(path_tail((char *)fname), ".ascii.") != NULL)
? "ascii" ? "ascii"
: (const char *)spell_enc())); : (const char *)spell_enc()));
set_option_value("spellfile", 0L, (const char *)buf, OPT_LOCAL); set_option_value_give_err("spellfile", 0L, (const char *)buf, OPT_LOCAL);
break; break;
} }
aspath = false; aspath = false;