updated for version 7.0-197

diff --git a/src/misc2.c b/src/misc2.c
index 04f34e97ccce6f8ae8f2679583492d1144fc91fd..9ed3e402ea4f5164dc7da022c5818f12fce0d090 100644 (file)
--- 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 26d8533aa9b55605021a11539a49d50254963fcb..27bd3d8f8c97ddfcd2d9800f948091d83c232bec 100644 (file)
--- 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 5846a406f7618f8985987ade2e9e22413af6bf63..4c22d495a642e0583207ba0fb299a3aafc08c1c2 100644 (file)
--- 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,
 /**/