# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1650481206 -7200
# Node ID f59db757e4ef49e04255e2515112e82c0546d0c7
# Parent  1e7b46dbdaed99d18a637b237883c57385031a1d
patch 8.2.4799: popup does not use correct topline

Commit: https://github.com/vim/vim/commit/0044e5100a0e76a0bc1ea18c63a432c20428de5e
Author: LemonBoy <thatlemon@gmail.com>
Date:   Wed Apr 20 19:47:37 2022 +0100

    patch 8.2.4799: popup does not use correct topline

    Problem:    Popup does not use correct topline.
    Solution:   Also add one when firstline is negative. (closes https://github.com/vim/vim/issues/10229)

diff --git a/src/popupwin.c b/src/popupwin.c
--- 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
--- 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
--- 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,