updated for version 7.2-122
diff --git a/src/screen.c b/src/screen.c
index 6c036d7..6d408eb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7368,7 +7368,11 @@
#endif
static int entered = FALSE; /* avoid recursiveness */
static int done_outofmem_msg = FALSE; /* did outofmem message */
+#ifdef FEAT_AUTOCMD
+ int retry_count = 0;
+retry:
+#endif
/*
* Allocation of the screen buffers is done only when the size changes and
* when Rows and Columns have been set and we have started doing full
@@ -7643,8 +7647,17 @@
--RedrawingDisabled;
#ifdef FEAT_AUTOCMD
- if (starting == 0)
+ /*
+ * Do not apply autocommands more than 3 times to avoid an endless loop
+ * in case applying autocommands always changes Rows or Columns.
+ */
+ if (starting == 0 && ++retry_count <= 3)
+ {
apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf);
+ /* In rare cases, autocommands may have altered Rows or Columns,
+ * jump back to check if we need to allocate the screen again. */
+ goto retry;
+ }
#endif
}
diff --git a/src/version.c b/src/version.c
index b7d484c..d324ae3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 122,
+/**/
121,
/**/
120,
