patch 8.1.1596: when resizing the screen may draw popup in wrong position

Problem:    When resizing the screen may draw popup in wrong position. (Masato
            Nishihata)
Solution:   Check the popup is not outside of the screen. (fixes #4592)
diff --git a/src/popupwin.c b/src/popupwin.c
index aa8bba0..b9526c7 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2154,8 +2154,9 @@
 	wp->w_winrow += top_off;
 	wp->w_wincol += left_off;
 
-	// Draw the popup text.
-	win_update(wp);
+	// Draw the popup text, unless it's off screen.
+	if (wp->w_winrow < screen_Rows && wp->w_wincol < screen_Columns)
+	    win_update(wp);
 
 	wp->w_winrow -= top_off;
 	wp->w_wincol -= left_off;
diff --git a/src/version.c b/src/version.c
index 0631f09..fa4e50d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1596,
+/**/
     1595,
 /**/
     1594,