From eeacd7bd718af5e6637e8a92a15f308b738a1fea Mon Sep 17 00:00:00 2001
From: luukvbaal <luukvbaal@gmail.com>
Date: Tue, 3 Jun 2025 13:27:07 +0200
Subject: [PATCH] fix(api): adjust fix for reconfiguring float "relative"
 (#34287)

Problem:  "win" is cleared in float config after 96330843, even with
          unchanged "relative".
Solution: Don't clear "win". Avoid erroring for deleted "win" by setting
          the parent win to curwin directly when "win" is zero or not
          present in config.
---
 src/nvim/api/win_config.c         | 11 +++++------
 test/functional/ui/float_spec.lua |  4 ++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/nvim/api/win_config.c b/src/nvim/api/win_config.c
index 04b1526dd5..0b008f27ec 100644
--- a/src/nvim/api/win_config.c
+++ b/src/nvim/api/win_config.c
@@ -236,8 +236,9 @@ Window nvim_open_win(Buffer buffer, Boolean enter, Dict(win_config) *config, Err
 
   win_T *wp = NULL;
   tabpage_T *tp = curtab;
-  win_T *parent = NULL;
-  if (config->win != -1) {
+  assert(curwin != NULL);
+  win_T *parent = config->win == 0 ? curwin : NULL;
+  if (config->win > 0) {
     parent = find_window_by_handle(fconfig.window, err);
     if (!parent) {
       // find_window_by_handle has already set the error
@@ -413,8 +414,8 @@ void nvim_win_set_config(Window window, Dict(win_config) *config, Error *err)
   if (!parse_win_config(win, config, &fconfig, !was_split || to_split, err)) {
     return;
   }
-  win_T *parent = NULL;
-  if (config->win != -1) {
+  win_T *parent = config->win == 0 ? curwin : NULL;
+  if (config->win > 0) {
     parent = find_window_by_handle(fconfig.window, err);
     if (!parent) {
       return;
@@ -1206,8 +1207,6 @@ static bool parse_win_config(win_T *wp, Dict(win_config) *config, WinConfig *fco
                     "non-float with 'win' requires at least 'split' or 'vertical'");
       goto fail;
     }
-  } else {
-    fconfig->window = 0;
   }
 
   if (HAS_KEY_X(config, external)) {
diff --git a/test/functional/ui/float_spec.lua b/test/functional/ui/float_spec.lua
index f8f18c3f5b..3ed69264c4 100644
--- a/test/functional/ui/float_spec.lua
+++ b/test/functional/ui/float_spec.lua
@@ -379,7 +379,11 @@ describe('float window', function()
       row = 1,
     })
     eq(1001, api.nvim_win_get_config(winid).win)
+    -- But unrelated config doesn't clear parent win #34286
+    api.nvim_win_set_config(winid, { title = 'foo' })
+    eq(1001, api.nvim_win_get_config(winid).win)
     command('close')
+    api.nvim_win_set_config(winid, { title = 'bar' })
     api.nvim_win_set_config(winid, { relative = 'editor', row = 1, col = 1 })
     eq(nil, api.nvim_win_get_config(winid).win)
   end)