1 files changed, 25 insertions, 24 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a09ad7924d..85e81ee975 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -4528,7 +4528,7 @@ static int eval_index(char_u **arg, typval_T *rettv, int evaluate, int verbose)
      * dict.name
      */
     key = *arg + 1;
-    for (len = 0; ASCII_ISALNUM(key[len]) || key[len] == '_'; ++len) {
+    for (len = 0; ASCII_ISALNUM(key[len]) || key[len] == '_'; len++) {
     }
     if (len == 0) {
       return FAIL;
@@ -4833,7 +4833,7 @@ int get_option_tv(const char **const arg, typval_T *const rettv, const bool eval
     } else if (opt_type == -1) {      // hidden number option
       rettv->v_type = VAR_NUMBER;
       rettv->vval.v_number = 0;
-    } else if (opt_type == 1) {       // number option
+    } else if (opt_type == 1 || opt_type == 2) {  // number or boolean option
       rettv->v_type = VAR_NUMBER;
       rettv->vval.v_number = numval;
     } else {                          // string option
@@ -6608,8 +6608,9 @@ void common_function(typval_T *argvars, typval_T *rettv, bool is_funcref, FunPtr
                          : (const char *)s));
     // Don't check an autoload name for existence here.
   } else if (trans_name != NULL
-             && (is_funcref ? find_func(trans_name) == NULL
-                            : !translated_function_exists((const char *)trans_name))) {
+             && (is_funcref
+                 ? find_func(trans_name) == NULL
+                 : !translated_function_exists((const char *)trans_name))) {
     semsg(_("E700: Unknown function: %s"), s);
   } else {
     int dict_idx = 0;
@@ -7151,30 +7152,30 @@ void dict_list(typval_T *const tv, typval_T *const rettv, const DictListType wha
     typval_T tv_item = { .v_lock = VAR_UNLOCKED };
 
     switch (what) {
-    case kDictListKeys:
-      tv_item.v_type = VAR_STRING;
-      tv_item.vval.v_string = vim_strsave(di->di_key);
-      break;
-    case kDictListValues:
-      tv_copy(&di->di_tv, &tv_item);
-      break;
-    case kDictListItems: {
-      // items()
-      list_T *const sub_l = tv_list_alloc(2);
-      tv_item.v_type = VAR_LIST;
-      tv_item.vval.v_list = sub_l;
-      tv_list_ref(sub_l);
-
-      tv_list_append_owned_tv(sub_l, (typval_T) {
+      case kDictListKeys:
+        tv_item.v_type = VAR_STRING;
+        tv_item.vval.v_string = vim_strsave(di->di_key);
+        break;
+      case kDictListValues:
+        tv_copy(&di->di_tv, &tv_item);
+        break;
+      case kDictListItems: {
+        // items()
+        list_T *const sub_l = tv_list_alloc(2);
+        tv_item.v_type = VAR_LIST;
+        tv_item.vval.v_list = sub_l;
+        tv_list_ref(sub_l);
+
+        tv_list_append_owned_tv(sub_l, (typval_T) {
           .v_type = VAR_STRING,
           .v_lock = VAR_UNLOCKED,
           .vval.v_string = (char_u *)xstrdup((const char *)di->di_key),
         });
 
-      tv_list_append_tv(sub_l, &di->di_tv);
+        tv_list_append_tv(sub_l, &di->di_tv);
 
-      break;
-    }
+        break;
+      }
     }
 
     tv_list_append_owned_tv(rettv->vval.v_list, tv_item);
@@ -9654,8 +9655,8 @@ bool var_check_func_name(const char *const name, const bool new_var)
 {
   // Allow for w: b: s: and t:.
   if (!(vim_strchr((char_u *)"wbst", name[0]) != NULL && name[1] == ':')
-      && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':') ? name[2]
-                                                           : name[0])) {
+      && !ASCII_ISUPPER((name[0] != NUL && name[1] == ':')
+                        ? name[2] : name[0])) {
     semsg(_("E704: Funcref variable name must start with a capital: %s"), name);
     return false;
   }