From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 20 Feb 2007 01:59:20 +0000 (+0000)
Subject: updated for version 7.0-197
X-Git-Tag: v7.0.197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c79d30ffe683c95c768b918789859dde452b04;p=thirdparty%2Fvim.git

updated for version 7.0-197
---

diff --git a/src/misc2.c b/src/misc2.c
index 04f34e97cc..9ed3e402ea 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 26d8533aa9..27bd3d8f8c 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 5846a406f7..4c22d495a6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    197,
 /**/
     196,
 /**/