aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-07-17 01:57:27 +0300
committerZyX <kp-pav@yandex.ru>2017-07-17 01:57:27 +0300
commitdc0a496d41ed23106632d12bbc33679997281c73 (patch)
tree967bff4f0218d21a674000c0df267cd6c0a06c0b /src
parentf4744e18219726d2eaa57b26198166ea255c62a4 (diff)
downloadrneovim-dc0a496d41ed23106632d12bbc33679997281c73.tar.gz
rneovim-dc0a496d41ed23106632d12bbc33679997281c73.tar.bz2
rneovim-dc0a496d41ed23106632d12bbc33679997281c73.zip
ex_getln: Do not do useless try_enter/try_leave calls
These are actually needed for two modes only. And even for these modes they should eventually go away.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_getln.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 1052053ddf..9bcabeee72 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -2356,24 +2356,28 @@ static bool color_cmdline(void)
Error err = ERROR_INIT;
const char *err_errmsg = (const char *)e_intern2;
bool dgc_ret = true;
+ bool tl_ret = true;
- try_enter(&tstate);
if (ccline.input_fn) {
color_cb = getln_input_callback;
} else if (ccline.cmdfirstc == ':') {
+ try_enter(&tstate);
err_errmsg = N_(
"E5408: Unable to get Nvim_color_cmdline callback from g:: %s");
dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_cmdline"),
&color_cb);
+ tl_ret = try_leave(&tstate, &err);
can_free_cb = true;
} else if (ccline.cmdfirstc == '=') {
+ try_enter(&tstate);
err_errmsg = N_(
"E5409: Unable to get Nvim_color_expr callback from g:: %s");
dgc_ret = tv_dict_get_callback(&globvardict, S_LEN("Nvim_color_expr"),
&color_cb);
+ tl_ret = try_leave(&tstate, &err);
can_free_cb = true;
}
- if (!try_leave(&tstate, &err) || !dgc_ret) {
+ if (!tl_ret || !dgc_ret) {
goto color_cmdline_error;
}