diff options
| -rw-r--r-- | src/popupwin.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_popupwin.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index e6792c852..27e9fe12e 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1414,7 +1414,7 @@ popup_adjust_position(win_T *wp) } if (wp->w_firstline < 0) - wp->w_topline = lnum > 0 ? lnum + 1 : lnum; + wp->w_topline = lnum + 1; wp->w_has_scrollbar = wp->w_want_scrollbar && (wp->w_topline > 1 || lnum <= wp->w_buffer->b_ml.ml_line_count); diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index b91689e50..3e5373ca8 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -514,6 +514,19 @@ func Test_popup_firstline() call assert_equal(5, popup_getpos(winid).firstline) call popup_close(winid) + + " Popup with less elements than the maximum height and negative firstline: + " check that the popup height is correctly computed. + let winid = popup_create(['xxx']->repeat(4), #{ + \ firstline: -1, + \ maxheight: 6, + \ }) + + let pos = popup_getpos(winid) + call assert_equal(3, pos.width) + call assert_equal(4, pos.height) + + call popup_close(winid) endfunc func Test_popup_firstline_cursorline() diff --git a/src/version.c b/src/version.c index 83d8e1b49..447bbd880 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4799, +/**/ 4798, /**/ 4797, |