1 files changed, 33 insertions, 20 deletions

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 24ba6110c4..5abdc33709 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -177,42 +177,47 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
   return vim_to_object(&di->di_tv);
 }
 
-/// Set a value in a scope dict. Objects are recursively expanded into their
-/// vimscript equivalents.
-///
-/// @param dict The vimscript dict
-/// @param key The key
-/// @param value The new value
-/// @param del Delete key in place of setting it. Argument `value` is ignored in
-///            this case.
-/// @param retval If true the old value will be converted and returned.
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value if `retval` is true and the key was present, else NIL
-Object dict_set_var(dict_T *dict, String key, Object value, bool del,
-                    bool retval, Error *err)
+dictitem_T *dict_check_writable(dict_T *dict, String key, bool del, Error *err)
 {
-  Object rv = OBJECT_INIT;
   dictitem_T *di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
 
   if (di != NULL) {
     if (di->di_flags & DI_FLAGS_RO) {
       api_set_error(err, kErrorTypeException, "Key is read-only: %s", key.data);
-      return rv;
     } else if (di->di_flags & DI_FLAGS_LOCK) {
       api_set_error(err, kErrorTypeException, "Key is locked: %s", key.data);
-      return rv;
     } else if (del && (di->di_flags & DI_FLAGS_FIX)) {
       api_set_error(err, kErrorTypeException, "Key is fixed: %s", key.data);
-      return rv;
     }
   } else if (dict->dv_lock) {
     api_set_error(err, kErrorTypeException, "Dictionary is locked");
-    return rv;
   } else if (key.size == 0) {
     api_set_error(err, kErrorTypeValidation, "Key name is empty");
-    return rv;
   } else if (key.size > INT_MAX) {
     api_set_error(err, kErrorTypeValidation, "Key name is too long");
+  }
+
+  return di;
+}
+
+/// Set a value in a scope dict. Objects are recursively expanded into their
+/// vimscript equivalents.
+///
+/// @param dict The vimscript dict
+/// @param key The key
+/// @param value The new value
+/// @param del Delete key in place of setting it. Argument `value` is ignored in
+///            this case.
+/// @param retval If true the old value will be converted and returned.
+/// @param[out] err Details of an error that may have occurred
+/// @return The old value if `retval` is true and the key was present, else NIL
+Object dict_set_var(dict_T *dict, String key, Object value, bool del,
+                    bool retval, Error *err)
+{
+  Object rv = OBJECT_INIT;
+  dictitem_T *di = dict_check_writable(dict, key, del, err);
+
+  if (ERROR_SET(err)) {
     return rv;
   }
 
@@ -1909,7 +1914,7 @@ bool parse_float_config(Dictionary config, FloatConfig *fconfig, bool reconf,
     } else if (strequal(key, "height")) {
       has_height = true;
       if (val.type == kObjectTypeInteger && val.data.integer > 0) {
-        fconfig->height= (int)val.data.integer;
+        fconfig->height = (int)val.data.integer;
       } else {
         api_set_error(err, kErrorTypeValidation,
                       "'height' key must be a positive Integer");
@@ -1983,6 +1988,14 @@ bool parse_float_config(Dictionary config, FloatConfig *fconfig, bool reconf,
                       "'focusable' key must be Boolean");
         return false;
       }
+    } else if (strequal(key, "zindex")) {
+      if (val.type == kObjectTypeInteger && val.data.integer > 0) {
+        fconfig->zindex = (int)val.data.integer;
+      } else {
+        api_set_error(err, kErrorTypeValidation,
+                      "'zindex' key must be a positive Integer");
+        return false;
+      }
     } else if (!strcmp(key, "border")) {
       parse_border_style(val, fconfig, err);
       if (ERROR_SET(err)) {