vim-patch:7.4.2098

Problem:    Text object tests are old style.
Solution:   Turn them into new style tests. (James McCoy, closes vim/vim#941)

00b24be454

src/nvim/testdir/Makefile

@@ -41,13 +41,14 @@ NEW_TESTS ?= \
 	    test_history.res \
 	    test_increment.res \
 	    test_increment_dbcs.res \
-		test_lambda.res \
+	    test_lambda.res \
 	    test_langmap.res \
 	    test_match.res \
 	    test_matchadd_conceal.res \
 	    test_quickfix.res \
 	    test_signs.res \
 	    test_syntax.res \
+	    test_textobjects.res \
 	    test_timers.res \
 	    test_usercommands.res \
 	    test_viml.res \

src/nvim/testdir/test_textobjects.vim

@@ -0,0 +1,43 @@
+" Test for textobjects
+
+if !has('textobjects')
+  finish
+endif
+
+function! CpoM(line, useM, expected)
+  new
+
+  if a:useM
+    set cpoptions+=M
+  else
+    set cpoptions-=M
+  endif
+
+  call setline(1, a:line)
+
+  call setreg('"', '')
+  normal! ggfrmavi)y
+  call assert_equal(getreg('"'), a:expected[0])
+
+  call setreg('"', '')
+  normal! `afbmavi)y
+  call assert_equal(getreg('"'), a:expected[1])
+
+  call setreg('"', '')
+  normal! `afgmavi)y
+  call assert_equal(getreg('"'), a:expected[2])
+
+  q!
+endfunction
+
+function! Test_inner_block_without_cpo_M()
+  call CpoM('(red \(blue) green)', 0, ['red \(blue', 'red \(blue', ''])
+endfunction
+
+function! Test_inner_block_with_cpo_M_left_backslash()
+  call CpoM('(red \(blue) green)', 1, ['red \(blue) green', 'blue', 'red \(blue) green'])
+endfunction
+
+function! Test_inner_block_with_cpo_M_right_backslash()
+  call CpoM('(red (blue\) green)', 1, ['red (blue\) green', 'blue\', 'red (blue\) green'])
+endfunction

src/nvim/version.c

@@ -342,7 +342,7 @@ static int included_patches[] = {
   // 2101,
   2100,
   2099,
-  // 2098,
+  2098,
   // 2097,
   2096,
   // 2095,