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

terminal.c: remove unnecessary macro

Browse Source
This commit is contained in:
Justin M. Keyes
2019-05-02 09:56:29 +02:00
parent fd0fd752c8
commit 660fe979c1
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/terminal.c
View File

@@ -1374,23 +1374,16 @@ static bool is_focused(Terminal *term)
return State & TERM_FOCUS && curbuf->terminal == term; return State & TERM_FOCUS && curbuf->terminal == term;
} }
#define GET_CONFIG_VALUE(k, o) \
do { \
Error err = ERROR_INIT; \
/* Only called from terminal_open where curbuf->terminal is the */ \
/* context */ \
o = dict_get_value(curbuf->b_vars, cstr_as_string(k), &err); \
api_clear_error(&err); \
if (o.type == kObjectTypeNil) { \
o = dict_get_value(&globvardict, cstr_as_string(k), &err); \
api_clear_error(&err); \
} \
} while (0)
static char *get_config_string(char *key) static char *get_config_string(char *key)
{ {
Object obj; Error err = ERROR_INIT;
GET_CONFIG_VALUE(key, obj); // Only called from terminal_open where curbuf->terminal is the context.
Object obj = dict_get_value(curbuf->b_vars, cstr_as_string(key), &err);
api_clear_error(&err);
if (obj.type == kObjectTypeNil) {
obj = dict_get_value(&globvardict, cstr_as_string(key), &err);
api_clear_error(&err);
}
if (obj.type == kObjectTypeString) { if (obj.type == kObjectTypeString) {
return obj.data.string.data; return obj.data.string.data;
} }