diff options
| author | vimboss <devnull@localhost> | 2009-02-22 20:13:39 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2009-02-22 20:13:39 +0000 |
| commit | 311a7096972e04be65febe7eb4dff5938f2cfeda (patch) | |
| tree | 2a0bb07eb314b9a565c89ad6f397bafe0948f1ed | |
| parent | 0c135770c45d70722e6b67bcaea0d7cf1a7c3d1d (diff) | |
| download | vim-311a7096972e04be65febe7eb4dff5938f2cfeda.tar.gz | |
| -rw-r--r-- | src/screen.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index 6c036d7e..6d408eb9 100644 --- a/src/screen.c +++ b/src/screen.c @@ -7368,7 +7368,11 @@ screenalloc(clear) #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 @@ give_up: --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 b7d484c9..d324ae37 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 122, +/**/ 121, /**/ 120, |