diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-12 01:08:36 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-12 01:08:36 -0400 |
| commit | a524200ca706d77b1519759225f73f684280b466 (patch) | |
| tree | 6027c4420baec58a3f5afb57b43c540505f9c520 | |
| parent | aa8ccef719cc84469aeb50ce04685163b8e715c1 (diff) | |
| parent | 1c4989c2a32b07ef5a87449be87ceab8b0f6a2e7 (diff) | |
| download | rneovim-a524200ca706d77b1519759225f73f684280b466.tar.gz rneovim-a524200ca706d77b1519759225f73f684280b466.tar.bz2 rneovim-a524200ca706d77b1519759225f73f684280b466.zip | |
Merge pull request #4729 from jbradaric/vim-7.4.1047
vim-patch 7.4.1047, 7.4.1048, 7.4.1049
| -rw-r--r-- | src/nvim/version.c | 6 | ||||
| -rw-r--r-- | test/functional/legacy/wordcount_spec.lua | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 50e3c324aa..b55d31ea76 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -633,9 +633,9 @@ static int included_patches[] = { 1052, // 1051, // 1050, - // 1049, - // 1048, - // 1047, + 1049, + 1048, + 1047, // 1046, // 1045 NA // 1044 NA diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua index 63787a59d3..ba7be8f21b 100644 --- a/test/functional/legacy/wordcount_spec.lua +++ b/test/functional/legacy/wordcount_spec.lua @@ -9,6 +9,10 @@ describe('wordcount', function() before_each(clear) it('is working', function() + execute('set selection=inclusive') + execute('fileformat=unix') + execute('fileformats=unix') + insert([=[ RESULT test:]=]) |