diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-02-07 15:00:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 15:00:11 +0100 |
| commit | a2d44c9af6d899273205fa9a9b0ee048823ea476 (patch) | |
| tree | a96d57868d6152d20e007d9c651ff2def6fa0426 /src | |
| parent | cca8d2751a238b7f64eec80fc74e786d358642ce (diff) | |
| parent | a090f1a3a4189e4163838d0bd97220580f007168 (diff) | |
| download | rneovim-a2d44c9af6d899273205fa9a9b0ee048823ea476.tar.gz rneovim-a2d44c9af6d899273205fa9a9b0ee048823ea476.tar.bz2 rneovim-a2d44c9af6d899273205fa9a9b0ee048823ea476.zip | |
Merge #6068 from lonerover/vim-7.4.2106
vim-patch:7.4.2106,7.4.2107
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 3b7f3b7b97..4b3798794c 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -2340,6 +2340,7 @@ int do_ecmd( } xfree(new_name); au_new_curbuf.br_buf = NULL; + au_new_curbuf.br_buf_free_count = 0; } curwin->w_pcmark.lnum = 1; @@ -2625,6 +2626,7 @@ static void delbuf_msg(char_u *name) name == NULL ? (char_u *)"" : name); xfree(name); au_new_curbuf.br_buf = NULL; + au_new_curbuf.br_buf_free_count = 0; } static int append_indent = 0; /* autoindent for first line */ diff --git a/src/nvim/version.c b/src/nvim/version.c index e73b68b6e7..7adf6781b9 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -333,8 +333,8 @@ static int included_patches[] = { 2110, 2109, // 2108 NA - // 2107, - // 2106, + 2107, + 2106, // 2105 NA // 2104, 2103, |