summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-11-20 12:16:58 +0100
committerBram Moolenaar <bram@vim.org>2012-11-20 12:16:58 +0100
commit773e5b4bf939cfb2501abea6c621acd9b1da5eb9 (patch)
treedac60a1c08d4f8c3fbd0205d95f129ae8a7fed41
parentc485cc5ddb4882b085cec00ecb69e542d11db36b (diff)
downloadvim-773e5b4bf939cfb2501abea6c621acd9b1da5eb9.tar.gz
updated for version 7.3.718v7.3.718v7-3-718
Problem: When re-using the current buffer the buffer-local options stay. Solution: Re-initialize the buffer-local options. (Christian Brabandt)
-rw-r--r--src/buffer.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 05da2860..7f0c106e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1702,6 +1702,11 @@ buflist_new(ffname, sfname, lnum, flags)
#endif
/* buf->b_nwindows = 0; why was this here? */
free_buffer_stuff(buf, FALSE); /* delete local variables et al. */
+
+ /* Init the options. */
+ buf->b_p_initialized = FALSE;
+ buf_copy_options(buf, BCO_ENTER);
+
#ifdef FEAT_KEYMAP
/* need to reload lmaps and set b:keymap_name */
curbuf->b_kmap_state |= KEYMAP_INIT;
diff --git a/src/version.c b/src/version.c
index 4bbb325c..5e4a16bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 718,
+/**/
717,
/**/
716,