Mercurial > vim
diff src/popupwin.c @ 18398:21c25bee9df8 v8.1.2193
patch 8.1.2193: popup_setoptions(popup_getoptions()) does not work
Commit: https://github.com/vim/vim/commit/a13961536e5b1e686574826d4ed713e3d5526715
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 20 18:46:05 2019 +0200
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 20 Oct 2019 19:00:03 +0200 |
| parents | ba5d8c5d77d7 |
| children | ee8db42dacf6 |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -493,12 +493,28 @@ handle_moved_argument(win_T *wp, dictite } 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;