summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-14 12:53:33 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-14 12:53:33 +0200
commitf0224c9f085849f4da87faa878279a641055fe83 (patch)
tree45b5c555edee090af9a41df797798fd19233ed20
parent0ae36a5c8542d51dd0d70035e997d96e4a20dcbb (diff)
downloadvim-git-f0224c9f085849f4da87faa878279a641055fe83.tar.gz
updated for version 7.4.326v7.4.326
Problem: Can't build Tiny version. (Elimar Riesebieter) Solution: Add #ifdef.
-rw-r--r--src/version.c2
-rw-r--r--src/window.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 0d0dfd2b4..6cc3d072e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 326,
+/**/
325,
/**/
324,
diff --git a/src/window.c b/src/window.c
index a94245a81..4a0ed23c7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4597,12 +4597,14 @@ win_free(wp, tp)
if (wp != aucmd_win)
#endif
win_remove(wp, tp);
+#ifdef FEAT_AUTOCMD
if (autocmd_busy)
{
wp->w_next = au_pending_free_win;
au_pending_free_win = wp;
}
else
+#endif
vim_free(wp);
#ifdef FEAT_AUTOCMD