diff options
author | ckelsel <ckelsel@hotmail.com> | 2017-08-21 09:19:08 +0800 |
---|---|---|
committer | ckelsel <ckelsel@hotmail.com> | 2017-08-21 09:19:08 +0800 |
commit | 0b6fa3a553da3b83419c48fcbb6fb3ec413598e0 (patch) | |
tree | 63cda34cb93df36f64be4beea934ee34d850104c /src/nvim/eval.c | |
parent | 673fc748237345914e0ad584bc4cba997c96a37e (diff) | |
parent | 8d1ccb606d3806dcf9c4bcfdb0446d8139c0e765 (diff) | |
download | rneovim-0b6fa3a553da3b83419c48fcbb6fb3ec413598e0.tar.gz rneovim-0b6fa3a553da3b83419c48fcbb6fb3ec413598e0.tar.bz2 rneovim-0b6fa3a553da3b83419c48fcbb6fb3ec413598e0.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r-- | src/nvim/eval.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ac22d75a83..d6ee13857a 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -22775,7 +22775,7 @@ typval_T eval_call_provider(char *provider, char *method, list_T *arguments) bool eval_has_provider(const char *name) { -#define check_provider(name) \ +#define CHECK_PROVIDER(name) \ if (has_##name == -1) { \ has_##name = !!find_func((char_u *)"provider#" #name "#Call"); \ if (!has_##name) { \ @@ -22791,17 +22791,17 @@ bool eval_has_provider(const char *name) static int has_python3 = -1; static int has_ruby = -1; - if (!strcmp(name, "clipboard")) { - check_provider(clipboard); + if (strequal(name, "clipboard")) { + CHECK_PROVIDER(clipboard); return has_clipboard; - } else if (!strcmp(name, "python3")) { - check_provider(python3); + } else if (strequal(name, "python3")) { + CHECK_PROVIDER(python3); return has_python3; - } else if (!strcmp(name, "python")) { - check_provider(python); + } else if (strequal(name, "python")) { + CHECK_PROVIDER(python); return has_python; - } else if (!strcmp(name, "ruby")) { - check_provider(ruby); + } else if (strequal(name, "ruby")) { + CHECK_PROVIDER(ruby); return has_ruby; } |