# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1612620004 -3600
# Node ID 12b446696927ecbe74b0246419e22efea5554d46
# Parent  970d9e1bbbabcd4586475d89f63b6859adb891fd
patch 8.2.2471: popup_setoptions() does not set textprop in other tab

Commit: https://github.com/vim/vim/commit/efa1923565f0669d5bc09714b22a3b50cde03785
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 6 14:59:27 2021 +0100

    patch 8.2.2471: popup_setoptions() does not set textprop in other tab

    Problem:    Popup_setoptions() does not set textprop in other tab.
    Solution:   use win_valid_any_tab(). (closes https://github.com/vim/vim/issues/7788)

diff --git a/src/popupwin.c b/src/popupwin.c
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -461,7 +461,7 @@ apply_move_options(win_T *wp, dict_T *d)
 	    if (di != NULL)
 	    {
 		wp->w_popup_prop_win = find_win_by_nr_or_id(&di->di_tv);
-		if (!win_valid(wp->w_popup_prop_win))
+		if (!win_valid_any_tab(wp->w_popup_prop_win))
 		    wp->w_popup_prop_win = curwin;
 	    }
 
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3813,8 +3813,27 @@ func Test_popup_getoptions_other_tab()
   call assert_equal(['textprop', 'textpropid', 'textpropwin'], popup_getoptions(id)->keys()->filter({_, v -> v =~ 'textprop'}))
 
   tabclose
+  call popup_close(id)
   bwipe!
   call prop_type_delete('textprop')
 endfunc
 
+
+func Test_popup_setoptions_other_tab()
+  new Xfile
+  let winid = win_getid()
+  call setline(1, 'some text')
+  call prop_type_add('textprop', {})
+  call prop_add(1, 1, #{type: 'textprop', length: 1})
+  let id = popup_create('TEST', #{textprop: 'textprop'})
+  tab sp
+  call popup_setoptions(id, #{textprop: 'textprop', textpropwin: winid})
+  call assert_equal(winid, popup_getoptions(id).textpropwin)
+
+  tabclose
+  call popup_close(id)
+  bwipe! Xfile
+  call prop_type_delete('textprop')
+endfunc
+
 " vim: shiftwidth=2 sts=2
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2471,
+/**/
     2470,
 /**/
     2469,