summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-02-20 01:59:20 +0000
committerBram Moolenaar <Bram@vim.org>2007-02-20 01:59:20 +0000
commit85c79d30ffe683c95c768b918789859dde452b04 (patch)
treee38205ef6a6276c19728f79bc32165deb25bf0a2
parent0396ab01565b39ba8d9cc4989aa04a1e5e5ff31c (diff)
downloadvim-git-85c79d30ffe683c95c768b918789859dde452b04.tar.gz
updated for version 7.0-197v7.0.197
-rw-r--r--src/misc2.c2
-rw-r--r--src/os_mswin.c5
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/misc2.c b/src/misc2.c
index 04f34e97c..9ed3e402e 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1075,7 +1075,7 @@ free_all_mem()
ResetRedobuff();
ResetRedobuff();
-#ifdef FEAT_CLIENTSERVER
+#if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
vim_free(serverDelayedStartName);
#endif
diff --git a/src/os_mswin.c b/src/os_mswin.c
index 26d8533aa..27bd3d8f8 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -239,6 +239,11 @@ mch_exit(int r)
if (gui.in_use)
gui_exit(r);
+
+#ifdef EXITFREE
+ free_all_mem();
+#endif
+
exit(r);
}
diff --git a/src/version.c b/src/version.c
index 5846a406f..4c22d495a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 197,
+/**/
196,
/**/
195,