Merge pull request #3867 from Shougo/vim-7.4.604

vim-patch:7.4.604
2025-02-25 18:55:25 -06:00 · 2015-12-20 15:31:45 -05:00 · 2015-12-20 15:31:45 -05:00 · e9161799bf
commit e9161799bf
parent e123675bcc 90537ae970
2 changed files with 2 additions and 2 deletions
--- 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
--- 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,