From b0588883081bd87a2dcd4c04a8eb3cf005cb6f2f Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 7 Sep 2014 02:36:41 -0400
Subject: try out easymotion again

---
 .gitmodules           |  3 +++
 vim/bundle/easymotion |  1 +
 vimrc                 | 21 ++++++++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 160000 vim/bundle/easymotion

diff --git a/.gitmodules b/.gitmodules
index fd8535c..2566e5b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule "vim/bundle/typescript"]
 	path = vim/bundle/typescript
 	url = git://github.com/leafgarland/typescript-vim
+[submodule "vim/bundle/easymotion"]
+	path = vim/bundle/easymotion
+	url = https://github.com/Lokaltog/vim-easymotion.git
diff --git a/vim/bundle/easymotion b/vim/bundle/easymotion
new file mode 160000
index 0000000..3b8a2dd
--- /dev/null
+++ b/vim/bundle/easymotion
@@ -0,0 +1 @@
+Subproject commit 3b8a2dda5c69612c948017424d621f83e38b51a5
diff --git a/vimrc b/vimrc
index 7779892..9ba62aa 100644
--- a/vimrc
+++ b/vimrc
@@ -744,7 +744,6 @@ function! s:unite_my_settings()
     autocmd InsertLeave <buffer>  call feedkeys("\<Plug>(unite_exit)")
 endfunction
 nnoremap <silent>t :Unite -silent -profile-name=with_dir buffer file_rec/async<CR>
-nnoremap <silent>f :Unite -silent buffer file<CR>
 nnoremap <silent>& :Unite -silent grep:.<CR>
 " }}}
 " vimfiler {{{
@@ -802,4 +801,24 @@ smap <expr><Tab>
                 \ "\<Tab>" :
                 \ neocomplete#start_manual_complete()
 " }}}
+" easymotion {{{
+let g:EasyMotion_do_mapping = 0
+let g:EasyMotion_smartcase = 1
+let g:EasyMotion_enter_jump_first = 1
+
+map ff <Plug>(easymotion-fl)
+omap ff <Plug>(easymotion-tl)
+
+map fj <Plug>(easymotion-j)
+map fk <Plug>(easymotion-k)
+map fh <Plug>(easymotion-linebackward)
+map fl <Plug>(easymotion-lineforward)
+
+map f/ <Plug>(easymotion-fn)
+omap f/ <Plug>(easymotion-tn)
+map f? <Plug>(easymotion-Fn)
+omap f? <Plug>(easymotion-Tn)
+map fn <Plug>(easymotion-vim-n)
+map fN <Plug>(easymotion-vim-N)
+" }}}
 " }}}
-- 
cgit v1.2.3-54-g00ecf