1 files changed, 14 insertions, 10 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 94d1697083..a773234ea0 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -15,6 +15,7 @@
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/dispatch.h"
 #include "nvim/api/buffer.h"
+#include "nvim/api/window.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/lua/executor.h"
@@ -31,6 +32,7 @@
 #include "nvim/edit.h"
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
+#include "nvim/fileio.h"
 #include "nvim/option.h"
 #include "nvim/state.h"
 #include "nvim/syntax.h"
@@ -978,11 +980,12 @@ Buffer nvim_create_buf(Boolean listed, Boolean scratch, Error *err)
     return 0;
   }
   if (scratch) {
-    WITH_BUFFER(buf, {
-      set_option_value("bh", 0L, "hide", OPT_LOCAL);
-      set_option_value("bt", 0L, "nofile", OPT_LOCAL);
-      set_option_value("swf", 0L, NULL, OPT_LOCAL);
-    });
+    aco_save_T aco;
+    aucmd_prepbuf(&aco, buf);
+    set_option_value("bh", 0L, "hide", OPT_LOCAL);
+    set_option_value("bt", 0L, "nofile", OPT_LOCAL);
+    set_option_value("swf", 0L, NULL, OPT_LOCAL);
+    aucmd_restbuf(&aco);
   }
   return buf->b_fnum;
 }
@@ -995,6 +998,8 @@ Buffer nvim_create_buf(Boolean listed, Boolean scratch, Error *err)
 /// GUI with the |ui-multigrid| extension. External windows are only supported
 /// with multigrid GUIs, and are displayed as separate top-level windows.
 ///
+/// For a general overview of floats, see |api-floatwin|.
+///
 /// Exactly one of `external` and `relative` must be specified.
 ///
 /// @param buffer handle of buffer to be displayed in the window
@@ -1047,7 +1052,6 @@ Window nvim_open_win(Buffer buffer, Boolean enter,
                      Dictionary options, Error *err)
   FUNC_API_SINCE(6)
 {
-  win_T *old = curwin;
   FloatConfig config = FLOAT_CONFIG_INIT;
   if (!parse_float_config(options, &config, false, err)) {
     return 0;
@@ -1056,11 +1060,11 @@ Window nvim_open_win(Buffer buffer, Boolean enter,
   if (!wp) {
     return 0;
   }
-  if (buffer > 0) {
-    nvim_set_current_buf(buffer, err);
+  if (enter) {
+    win_enter(wp, false);
   }
-  if (!enter) {
-    win_enter(old, false);
+  if (buffer > 0) {
+    nvim_win_set_buf(wp->handle, buffer, err);
   }
   return wp->handle;
 }