updated for version 7.1-289

diff --git a/src/misc2.c b/src/misc2.c
index fd0405fd9ab90c68c6417d412f1d02af1562722d..6a562d8893c2f4f4f57aec3cbf71e0c65518cad0 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -751,7 +751,7 @@ vim_mem_profile_dump()
 #endif
 
 /*
- * Note: if unsinged is 16 bits we can only allocate up to 64K with alloc().
+ * Note: if unsigned is 16 bits we can only allocate up to 64K with alloc().
  * Use lalloc for larger blocks.
  */
     char_u *
@@ -1082,7 +1082,11 @@ free_all_mem()
     win_free_all();
 #endif
 
-    /* Free all buffers. */
+    /* Free all buffers.  Reset 'autochdir' to avoid accessing things that
+     * were freed already. */
+#ifdef FEAT_AUTOCHDIR
+    p_acd = FALSE;
+#endif
     for (buf = firstbuf; buf != NULL; )
     {
        nextbuf = buf->b_next;

diff --git a/src/version.c b/src/version.c
index c2f7e97d43d42f837e82356d8d391e3d10746ceb..f8579033b7f13591277be4caa3f8d7a9aca4378c 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 */
+/**/
+    289,
 /**/
     288,
 /**/