From af966afaa448dc78eb065e61be36ac9a577b0419 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Mon, 4 Mar 2019 17:52:55 +0100
Subject: window: simplify logic for entering new float

---
 src/nvim/api/vim.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index cb5ed5ecda..955920d6ae 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"
@@ -1049,7 +1050,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;
@@ -1058,11 +1058,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;
 }
-- 
cgit