Merge pull request #14659 from seandewar/api-win-buf-noautocmd

api(nvim_open_win): Enable BufEnter autocmds by default like ordinary window; add "noautocmd" option to block BufEnter.

1 files changed, 14 insertions, 17 deletions

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 5abdc33709..4b1c2d4baa 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -1645,7 +1645,7 @@ bool api_object_to_bool(Object obj, const char *what,
   } else if (obj.type == kObjectTypeNil) {
     return nil_value;  // caller decides what NIL (missing retval in lua) means
   } else {
-    api_set_error(err, kErrorTypeValidation, "%s is not an boolean", what);
+    api_set_error(err, kErrorTypeValidation, "%s is not a boolean", what);
     return false;
   }
 }
@@ -1868,7 +1868,7 @@ static void parse_border_style(Object style, FloatConfig *fconfig, Error *err)
 }
 
 bool parse_float_config(Dictionary config, FloatConfig *fconfig, bool reconf,
-                        Error *err)
+                        bool new_win, Error *err)
 {
   // TODO(bfredl): use a get/has_key interface instead and get rid of extra
   // flags
@@ -1968,24 +1968,15 @@ bool parse_float_config(Dictionary config, FloatConfig *fconfig, bool reconf,
       }
       has_bufpos = true;
     } else if (!strcmp(key, "external")) {
-      if (val.type == kObjectTypeInteger) {
-        fconfig->external = val.data.integer;
-      } else if (val.type == kObjectTypeBoolean) {
-        fconfig->external = val.data.boolean;
-      } else {
-        api_set_error(err, kErrorTypeValidation,
-                      "'external' key must be Boolean");
+      has_external = fconfig->external
+          = api_object_to_bool(val, "'external' key", false, err);
+      if (ERROR_SET(err)) {
         return false;
       }
-      has_external = fconfig->external;
     } else if (!strcmp(key, "focusable")) {
-      if (val.type == kObjectTypeInteger) {
-        fconfig->focusable = val.data.integer;
-      } else if (val.type == kObjectTypeBoolean) {
-        fconfig->focusable = val.data.boolean;
-      } else {
-        api_set_error(err, kErrorTypeValidation,
-                      "'focusable' key must be Boolean");
+      fconfig->focusable
+          = api_object_to_bool(val, "'focusable' key", true, err);
+      if (ERROR_SET(err)) {
         return false;
       }
     } else if (strequal(key, "zindex")) {
@@ -2015,6 +2006,12 @@ bool parse_float_config(Dictionary config, FloatConfig *fconfig, bool reconf,
         api_set_error(err, kErrorTypeValidation,
                       "Invalid value of 'style' key");
       }
+    } else if (strequal(key, "noautocmd") && new_win) {
+      fconfig->noautocmd
+          = api_object_to_bool(val, "'noautocmd' key", false, err);
+      if (ERROR_SET(err)) {
+        return false;
+      }
     } else {
       api_set_error(err, kErrorTypeValidation,
                     "Invalid key '%s'", key);