commit 3697c9bbae755831d3cf2f11179aaff29e343f51
author Bram Moolenaar <Bram@vim.org> Sat Sep 26 22:03:00 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Sep 26 22:03:00 2020 +0200
tree 7dbdca17e7a50d28d76e95109b2c2811230727ab
parent c70bdab0b8a8262a3784084aa1e6271fee8452f1

patch 8.2.1750: popup_setoptions() setting firstline fails if cursorline set

Problem:    Setting firstline with popup_setoptions() fails if cursorline is
            set.
Solution:   Use apply_options(). Update the popup before applying "zz".
            (closes #7010)

src/move.c

diff --git a/src/move.c b/src/move.c
index 767134f..20a34e8 100644
--- a/src/move.c
+++ b/src/move.c
@@ -2144,6 +2144,10 @@
     linenr_T	old_topline = curwin->w_topline;
 #endif
 
+#ifdef FEAT_PROP_POPUP
+    // if the width changed this needs to be updated first
+    may_update_popup_position();
+#endif
     loff.lnum = boff.lnum = curwin->w_cursor.lnum;
 #ifdef FEAT_FOLDING
     (void)hasFolding(loff.lnum, &loff.lnum, &boff.lnum);