diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:53:05 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-27 21:53:05 -0400 |
| commit | 4ff793eaab23c2925704a1b8a58a0b76e4b2ce34 (patch) | |
| tree | 96865d3349029ea0b942961989b10e723c81f708 /src | |
| parent | b447b865cdb7b1b2e1185d183ff132574fc87546 (diff) | |
| parent | cc410185c03fd2fb872148005836ba7ffe771d04 (diff) | |
| download | rneovim-4ff793eaab23c2925704a1b8a58a0b76e4b2ce34.tar.gz rneovim-4ff793eaab23c2925704a1b8a58a0b76e4b2ce34.tar.bz2 rneovim-4ff793eaab23c2925704a1b8a58a0b76e4b2ce34.zip | |
Merge pull request #4655 from brcolow/vim-7.4.1035
vim-patch: 7.4.1035
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 648a3a8487..1f7e2f4e2b 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -1826,9 +1826,10 @@ static char_u * do_one_cmd(char_u **cmdlinep, correct_range(&ea); - if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy) { - /* Put the first line at the start of a closed fold, put the last line - * at the end of a closed fold. */ + if (((ea.argt & WHOLEFOLD) || ea.addr_count >= 2) && !global_busy + && ea.addr_type == ADDR_LINES) { + // Put the first line at the start of a closed fold, put the last line + // at the end of a closed fold. (void)hasFolding(ea.line1, &ea.line1, NULL); (void)hasFolding(ea.line2, NULL, &ea.line2); } diff --git a/src/nvim/version.c b/src/nvim/version.c index 1c4dcca8f7..0639ec6faf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -643,7 +643,7 @@ static int included_patches[] = { // 1038 NA // 1037, // 1036, - // 1035, + 1035, // 1034, // 1033 NA 1032, |