To: vim_dev@googlegroups.com Subject: Patch 8.1.2109 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2109 Problem: popup_getoptions() hangs with tab-local popup. Solution: Correct pointer name. (Marko Mahnič, closes #5006) Files: src/popupwin.c, src/testdir/test_popupwin.vim *** ../vim-8.1.2108/src/popupwin.c 2019-10-01 17:01:56.346282798 +0200 --- src/popupwin.c 2019-10-02 22:53:33.369246246 +0200 *************** *** 2636,2647 **** i = 1; FOR_ALL_TABPAGES(tp) { ! win_T *p; ! for (p = tp->tp_first_popupwin; p != NULL; p = wp->w_next) ! if (p->w_id == id) break; ! if (p != NULL) break; ++i; } --- 2636,2647 ---- i = 1; FOR_ALL_TABPAGES(tp) { ! win_T *twp; ! for (twp = tp->tp_first_popupwin; twp != NULL; twp = twp->w_next) ! if (twp->w_id == id) break; ! if (twp != NULL) break; ++i; } *** ../vim-8.1.2108/src/testdir/test_popupwin.vim 2019-09-25 23:06:35.859483812 +0200 --- src/testdir/test_popupwin.vim 2019-10-02 23:03:50.426647592 +0200 *************** *** 2556,2559 **** --- 2556,2571 ---- call popup_clear() endfunc + func Test_popupwin_getoptions_tablocal() + topleft split + let win1 = popup_create('nothing', #{maxheight: 8}) + let win2 = popup_create('something', #{maxheight: 10}) + let win3 = popup_create('something', #{maxheight: 15}) + call assert_equal(8, popup_getoptions(win1).maxheight) + call assert_equal(10, popup_getoptions(win2).maxheight) + call assert_equal(15, popup_getoptions(win3).maxheight) + call popup_clear() + quit + endfunc + " vim: shiftwidth=2 sts=2 *** ../vim-8.1.2108/src/version.c 2019-10-01 17:38:46.484054055 +0200 --- src/version.c 2019-10-02 23:06:28.917607208 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 2109, /**/ -- CRONE: Who sent you? ARTHUR: The Knights Who Say Ni! CRONE: Aaaagh! (she looks around in rear) No! We have no shrubberies here. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///