diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-20 15:31:45 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-20 15:31:45 -0500 |
| commit | e9161799bf643e5df5038f09fced3c0e1690a66d (patch) | |
| tree | e8cfee3448cc964533b3a66cba8183ea2deae192 /src | |
| parent | e123675bcce886c1da3d917fbd88ab38cda7eba5 (diff) | |
| parent | 90537ae970f571a596fe081fd3dd2d1cbf538b2a (diff) | |
| download | rneovim-e9161799bf643e5df5038f09fced3c0e1690a66d.tar.gz rneovim-e9161799bf643e5df5038f09fced3c0e1690a66d.tar.bz2 rneovim-e9161799bf643e5df5038f09fced3c0e1690a66d.zip | |
Merge pull request #3867 from Shougo/vim-7.4.604
vim-patch:7.4.604
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_breakindent.in | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_breakindent.in b/src/nvim/testdir/test_breakindent.in index b05aef7f8d..5a8e580c4a 100644 --- a/src/nvim/testdir/test_breakindent.in +++ b/src/nvim/testdir/test_breakindent.in @@ -101,7 +101,7 @@ fygjyl:let line2 = @0 :$put =line2 :" :let g:test="Test 14: breakindent + visual blockwise delete #1" -:set all& breakindent +:set all& breakindent shada+=nX-test-breakindent.shada :30vnew :normal! 3a1234567890 :normal! a abcde diff --git a/src/nvim/version.c b/src/nvim/version.c index 33c310a8b2..9a9cb509a8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -389,7 +389,7 @@ static int included_patches[] = { // 607, 606, // 605, - // 604, + 604, // 603, 602, 601, |