convert the fold text object to use the new helper function

1 files changed, 10 insertions, 16 deletions

diff --git a/vimrc b/vimrc
index b594357..7ce90e4 100644
--- a/vimrc
+++ b/vimrc
@@ -367,25 +367,19 @@ endfunction
 call Textobj('/', 'Textobj_regex')
 " }}}
 " f for folds {{{
-function Textobj_fold(inner, operator, count)
+function Textobj_fold(inner, count)
+    let pos = getpos('.')
+
     exe 'normal! '.a:count.'[z'
-    let startpos = line('.') + a:inner
+    let startline = line('.') + a:inner
     normal! ]z
-    let endpos = line('.') - a:inner
-    exe 'normal! '.startpos.'G'
-    exe 'normal! '.a:operator.endpos.'G'
-
-    if a:operator == 'c'
-        normal! l
-        startinsert
-    elseif a:operator == 'v'
-        normal! $
-    endif
+    let endline = line('.') - a:inner
+
+    call setpos('.', pos)
+
+    return [startline, 1, endline, strlen(getline(endline))]
 endfunction
-onoremap <silent>af <Esc>:call Textobj_fold(0, v:operator, v:prevcount)<CR>
-onoremap <silent>if <Esc>:call Textobj_fold(1, v:operator, v:prevcount)<CR>
-xnoremap <silent>af <Esc>:call Textobj_fold(0, 'v', v:prevcount)<CR>
-xnoremap <silent>if <Esc>:call Textobj_fold(1, 'v', v:prevcount)<CR>
+call Textobj('f', 'Textobj_fold')
 " }}}
 " }}}