diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-05-10 20:57:44 +0200 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-05-10 20:58:39 +0200 |
| commit | 6e9e5d23ce3e295f732b28fb1e9281fcc830b118 (patch) | |
| tree | e846dbc7116634495f166412804f1c0e2c1a0ca4 | |
| parent | ae7500457e13ca89c31884fa506194f0f330f89a (diff) | |
| download | rneovim-6e9e5d23ce3e295f732b28fb1e9281fcc830b118.tar.gz rneovim-6e9e5d23ce3e295f732b28fb1e9281fcc830b118.tar.bz2 rneovim-6e9e5d23ce3e295f732b28fb1e9281fcc830b118.zip | |
vim-patch:7.4.1048
Problem: Wordcount test still fail on MS-Windows.
Solution: Set 'fileformat' to "unix".
https://github.com/vim/vim/commit/c7803a1c42228566ee2e2efcd621b21d0a8ed3ea
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/wordcount_spec.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 688b39def5..b442a0a903 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -630,7 +630,7 @@ static int included_patches[] = { // 1051, // 1050, // 1049, - // 1048, + 1048, 1047, // 1046, // 1045 NA diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua index a1efbdc893..64f1fe7851 100644 --- a/test/functional/legacy/wordcount_spec.lua +++ b/test/functional/legacy/wordcount_spec.lua @@ -10,6 +10,7 @@ describe('wordcount', function() it('is working', function() execute('set selection=inclusive') + execute('fileformat=unix') insert([=[ RESULT test:]=]) |