Merge pull request #57 from kana/fix-c

Fix <SID>(restore-marks) not to leave in buffer.
Close gh-56.

autoload/textobj/user.vim

@@ -782,7 +782,9 @@ function! s:fail(interface_key_mapping_lhs)
 endfunction
 
 noremap <expr> <SID>(save-marks) <SID>save_marks()
+noremap! <expr> <SID>(save-marks) <SID>save_marks()
 noremap <expr> <SID>(restore-marks) <SID>restore_marks()
+noremap! <expr> <SID>(restore-marks) <SID>restore_marks()
 
 let s:original_marks = {}
 

t/keep-marks.vim

@@ -31,7 +31,8 @@ describe 'Custom text object'
     \   '  qux()',
     \   '}',
     \ ]
-    let @0 = '*nothing yanked*'
+    silent $ delete _
+    let @" = '*nothing changed*'
     execute 'normal!' "1G2|vj\<Esc>"
   end
 
@@ -41,7 +42,7 @@ describe 'Custom text object'
 
   context 'defined by a function'
     it 'keeps ''< and ''> marks'
-      Expect @0 ==# '*nothing yanked*'
+      Expect @0 ==# '*nothing changed*'
       Expect [line("'<"), col("'<")] == [1, 2]
       Expect [line("'>"), col("'>")] == [2, 2]
 
@@ -55,7 +56,7 @@ describe 'Custom text object'
 
   context 'defined by a pattern'
     it 'keeps ''< and ''> marks'
-      Expect @0 ==# '*nothing yanked*'
+      Expect @0 ==# '*nothing changed*'
       Expect [line("'<"), col("'<")] == [1, 2]
       Expect [line("'>"), col("'>")] == [2, 2]
 
@@ -66,6 +67,26 @@ describe 'Custom text object'
       Expect [line("'>"), col("'>")] == [2, 2]
     end
   end
+
+  context 'combined with operator c'
+    it 'also works fine'
+      Expect @" ==# '*nothing changed*'
+      Expect [line("'<"), col("'<")] == [1, 2]
+      Expect [line("'>"), col("'>")] == [2, 2]
+
+      normal 3Gcilxyzzy
+
+      Expect @" ==# 'qux()'
+      Expect getline(1, '$') ==# [
+      \   'if (!foo) {',
+      \   '  bar = ''baz''',
+      \   '  xyzzy',
+      \   '}',
+      \ ]
+      Expect [line("'<"), col("'<")] == [1, 2]
+      Expect [line("'>"), col("'>")] == [2, 2]
+    end
+  end
 end
 
 " __END__  "{{{1