1 files changed, 9 insertions, 16 deletions
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index bdcade0d86..d8d529d0f6 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -374,6 +374,7 @@ void terminal_enter(void)
   TerminalState state, *s = &state;
   memset(s, 0, sizeof(TerminalState));
   s->term = buf->terminal;
+  stop_insert_mode = false;
 
   // Ensure the terminal is properly sized. Ideally window size management
   // code should always have resized the terminal already, but check here to
@@ -450,7 +451,6 @@ static void terminal_check_cursor(void)
 static int terminal_check(VimState *state)
 {
   if (stop_insert_mode) {
-    stop_insert_mode = false;
     return 0;
   }
 
@@ -1339,23 +1339,16 @@ static bool is_focused(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)
 {
-  Object obj;
-  GET_CONFIG_VALUE(key, obj);
+  Error err = ERROR_INIT;
+  // 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) {
     return obj.data.string.data;
   }