summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-04-01 12:53:43 +0000
committerBram Moolenaar <Bram@vim.org>2008-04-01 12:53:43 +0000
commit2a3297464619cbf7c2842534e3e8d252b9c59069 (patch)
treeaf812cf3064d123d0546135555db227005e0ff93
parente9b2884c088558d6b00b36f78c4e86a8ac2893a1 (diff)
downloadvim-2a3297464619cbf7c2842534e3e8d252b9c59069.zip
updated for version 7.1-289
-rw-r--r--src/misc2.c8
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/misc2.c b/src/misc2.c
index fd0405fd9..6a562d889 100644
--- 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 c2f7e97d4..f8579033b 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 */
/**/
+ 289,
+/**/
288,
/**/
287,