# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1301576879 14400
# Node ID 501b64da8d723b08483e9a21e545afe904f7f631
# Parent  a0023e3d1283b3c5144af70e5519c01f2ecbdb8e
vim: easymotion bindings and colors

diff -r a0023e3d1283 -r 501b64da8d72 vim/.vimrc
--- a/vim/.vimrc	Wed Mar 30 12:50:50 2011 -0400
+++ b/vim/.vimrc	Thu Mar 31 09:07:59 2011 -0400
@@ -378,7 +378,7 @@
 " Convenience mappings -------------------------------------------------------- {{{
 
 " Clean whitespace
-map <leader>c :%s/\s\+$//<cr>:let @/=''<CR>
+map <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
 
 " Ack
 map <leader>a :Ack 
@@ -420,8 +420,8 @@
 nmap <leader>R :RainbowParenthesesToggle<CR>
 
 " Edit vim stuff
-nnoremap <leader>Ev <C-w>s<C-w>j<C-w>L:e $MYVIMRC<cr>
-nnoremap <leader>Es <C-w>s<C-w>j<C-w>L:e ~/.vim/snippets/<cr>
+nnoremap <leader>ev <C-w>s<C-w>j<C-w>L:e $MYVIMRC<cr>
+nnoremap <leader>es <C-w>s<C-w>j<C-w>L:e ~/.vim/snippets/<cr>
 
 " Sudo to write
 cmap w!! w !sudo tee % >/dev/null
@@ -511,21 +511,6 @@
 nnoremap <silent> <Leader>F      :call EasyMotionF(0, 1)<CR>
 vnoremap <silent> <Leader>F :<C-U>call EasyMotionF(1, 1)<CR>
 
-nnoremap <silent> <Leader>t      :call EasyMotionT(0, 0)<CR>
-vnoremap <silent> <Leader>t :<C-U>call EasyMotionT(1, 0)<CR>
-
-nnoremap <silent> <Leader>T      :call EasyMotionT(0, 1)<CR>
-vnoremap <silent> <Leader>T :<C-U>call EasyMotionT(1, 1)<CR>
-
-nnoremap <silent> <Leader>w      :call EasyMotionW(0)<CR>
-vnoremap <silent> <Leader>w :<C-U>call EasyMotionW(1)<CR>
-
-nnoremap <silent> <Leader>e      :call EasyMotionE(0)<CR>
-vnoremap <silent> <Leader>e :<C-U>call EasyMotionE(1)<CR>
-
-nnoremap <silent> <Leader>b      :call EasyMotionB(0)<CR>
-vnoremap <silent> <Leader>b :<C-U>call EasyMotionB(1)<CR>
-
 " }}}
 
 " }}}
diff -r a0023e3d1283 -r 501b64da8d72 vim/colors/molokai.vim
--- a/vim/colors/molokai.vim	Wed Mar 30 12:50:50 2011 -0400
+++ b/vim/colors/molokai.vim	Thu Mar 31 09:07:59 2011 -0400
@@ -52,6 +52,8 @@
 hi vCursor         guifg=#000000 guibg=#AAF412
 " }}}
 
+hi EasyMotionTarget guifg=#E4E500 guibg=bg gui=bold
+hi EasyMotionShade guifg=#444444 guibg=bg gui=bold
 hi Directory       guifg=#A6E22E               gui=bold
 hi Error           guifg=#960050 guibg=#1E0010
 hi ErrorMsg        guifg=#F92672 guibg=#232526 gui=bold