commit a13961536e5b1e686574826d4ed713e3d5526715
author Bram Moolenaar <Bram@vim.org> Sun Oct 20 18:46:05 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Oct 20 18:46:05 2019 +0200
tree 63a0cbe0b2edab411bd7991afae9217b8b8e2729
parent dca7abe79cc4f0933473c3e4bcc75b46cc2c48fd

patch 8.1.2193: popup_setoptions(popup_getoptions()) does not work

Problem:    Popup_setoptions(popup_getoptions()) does not work.
Solution:   Also accept a list with three entries for "moved" and
            "mousemoved". (closes #5081)

src/popupwin.c

diff --git a/src/popupwin.c b/src/popupwin.c
index 95435f8..a957932 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -493,12 +493,28 @@
     }
     else if (di->di_tv.v_type == VAR_LIST
 	    && di->di_tv.vval.v_list != NULL
-	    && di->di_tv.vval.v_list->lv_len == 2)
+	    && (di->di_tv.vval.v_list->lv_len == 2
+	     || di->di_tv.vval.v_list->lv_len == 3))
     {
-	list_T	*l = di->di_tv.vval.v_list;
-	int	mincol = tv_get_number(&l->lv_first->li_tv);
-	int	maxcol = tv_get_number(&l->lv_first->li_next->li_tv);
+	list_T	    *l = di->di_tv.vval.v_list;
+	listitem_T  *li = l->lv_first;
+	int	    mincol;
+	int	    maxcol;
 
+	if (di->di_tv.vval.v_list->lv_len == 3)
+	{
+	    varnumber_T nr = tv_get_number(&l->lv_first->li_tv);
+
+	    // Three numbers, might be from popup_getoptions().
+	    if (mousemoved)
+		wp->w_popup_mouse_row = nr;
+	    else
+		wp->w_popup_lnum = nr;
+	    li = li->li_next;
+	}
+
+	mincol = tv_get_number(&li->li_tv);
+	maxcol = tv_get_number(&li->li_next->li_tv);
 	if (mousemoved)
 	{
 	    wp->w_popup_mouse_mincol = mincol;

src/testdir/test_popupwin.vim

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 2e2d1df..dc382d8 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -170,6 +170,10 @@
   call assert_equal(['Top', 'Right', 'Bottom', 'Left'], options.borderhighlight)
   call assert_equal(['1', '^', '2', '>', '3', 'v', '4', '<'], options.borderchars)
 
+  " Check that popup_setoptions() takes the output of popup_getoptions()
+  call popup_setoptions(winid, options)
+  call assert_equal(options, popup_getoptions(winid))
+
   let winid = popup_create('hello both', #{line: 3, col: 8, border: [], padding: []})
   call assert_equal(#{
 	\ line: 3,

src/version.c

diff --git a/src/version.c b/src/version.c
index 76b4c1c..6c8a36b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2193,
+/**/
     2192,
 /**/
     2191,