neovim
diff --git a/‎src/nvim/terminal.c
Copy file name to clipboardExpand all lines: src/nvim/terminal.c
+9-15Lines changed: 9 additions & 15 deletions b/‎src/nvim/terminal.c
Copy file name to clipboardExpand all lines: src/nvim/terminal.c
+9-15Lines changed: 9 additions & 15 deletions
@@ -279,6 +279,7 @@ Terminal *terminal_open(TerminalOptions opts)
     char var[64];
     snprintf(var, sizeof(var), "terminal_color_%d", i);
     char *name = get_config_string(var);
+    ELOG("i=%d name=%s", i, name);
     if (name) {
       color_val = name_to_color((uint8_t *)name);
       xfree(name);
@@ -1374,23 +1375,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;
   }