mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-17 15:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

api: {get,set}_option should {get,set} global value of local options (#6405)

Browse Source 
- nvim_get_option should return the global default of a local option.
- nvim_set_option should set the global default of a local option.
This commit is contained in:
Jakob Schnitzer
2017-03-30 22:03:52 +02:00
committed by Justin M. Keyes
parent 66b336d89b
commit eb0e94f71b
5 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/option.c
View File

@@ -4619,14 +4619,13 @@ int get_option_value_strict(char *name,
}
char_u *varp = NULL;
vimoption_T *p;
int rv = 0;
int opt_idx = findoption(name);
if (opt_idx < 0) {
return 0;
}
p = &(options[opt_idx]);
vimoption_T *p = &options[opt_idx];
// Hidden option
if (p->var == NULL) {
@@ -4642,26 +4641,25 @@ int get_option_value_strict(char *name,
}
if (p->indir == PV_NONE) {
if (opt_type == SREQ_GLOBAL)
if (opt_type == SREQ_GLOBAL) {
rv |= SOPT_GLOBAL;
else
return 0; // Did not request global-only option
} else {
return 0; // Did not request global-only option
}
} else {
if (p->indir & PV_BOTH) {
rv |= SOPT_GLOBAL;
} else if (opt_type == SREQ_GLOBAL) {
return 0; // Requested global option
}
if (p->indir & PV_WIN) {
if (opt_type == SREQ_BUF) {
return 0; // Did not request window-local option
return 0; // Requested buffer-local, not window-local option
} else {
rv |= SOPT_WIN;
}
} else if (p->indir & PV_BUF) {
if (opt_type == SREQ_WIN) {
return 0; // Did not request buffer-local option
return 0; // Requested window-local, not buffer-local option
} else {
rv |= SOPT_BUF;
}
@@ -4673,7 +4671,11 @@ int get_option_value_strict(char *name,
}
if (opt_type == SREQ_GLOBAL) {
varp = p->var;
if (p->var == VAR_WIN) {
return 0;
} else {
varp = p->var;
}
} else {
if (opt_type == SREQ_BUF) {
// Special case: 'modified' is b_changed, but we also want to
@@ -4720,7 +4722,7 @@ int get_option_value_strict(char *name,
/// @param[in] name Option name.
/// @param[in] number New value for the number or boolean option.
/// @param[in] string New value for string option.
/// @param[in] opt_flags Flags: OPT_LOCAL or 0 (both).
/// @param[in] opt_flags Flags: OPT_LOCAL, OPT_GLOBAL, or 0 (both).
///
/// @return NULL on success, error message on error.
char *set_option_value(const char *const name, const long number,