From 4cc0693d76a370e4e4d65e09a36d8fb06e49bdec Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Sun, 6 Jan 2019 10:22:43 +0100
Subject: [vim] Update generalized_motion

---
 vim/.vim/after/plugin/generalized_motion.vim | 7 ++++---
 vim/.vimrc                                   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'vim')

diff --git a/vim/.vim/after/plugin/generalized_motion.vim b/vim/.vim/after/plugin/generalized_motion.vim
index 112016c..a2b4284 100644
--- a/vim/.vim/after/plugin/generalized_motion.vim
+++ b/vim/.vim/after/plugin/generalized_motion.vim
@@ -1,7 +1,4 @@
 "" More general ; {{{1
-" if exists('g:loaded_sneak_plugin')
-
-" endif
 
 let g:generalized_motion = "f"
 function! Generalized_motion(...)
@@ -10,9 +7,11 @@ function! Generalized_motion(...)
         echom "Generalized motion:" g:generalized_motion
         if (g:generalized_motion == "f") | call feedkeys('f', 'n') | return | endif
         if (g:generalized_motion == "t") | call feedkeys('t', 'n') | return | endif
+        if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_s") | return | endif
     endif
     if (g:generalized_motion == "f") | call feedkeys(';', 'n') | endif
     if (g:generalized_motion == "t") | call feedkeys(';', 'n') | endif
+    if (g:generalized_motion == "s") | call feedkeys("\<Plug>Sneak_;") | return | endif
     try
         if (g:generalized_motion == "]q") | cnext | endif
         if (g:generalized_motion == "[q") | cprevious | endif
@@ -20,6 +19,8 @@ function! Generalized_motion(...)
         if (g:generalized_motion == "[a") | previous | endif
         if (g:generalized_motion == "]b") | bnext | endif
         if (g:generalized_motion == "[b") | bprevious | endif
+        if (g:generalized_motion == "]f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
+        if (g:generalized_motion == "[f") | call feedkeys("\<Plug>unimpairedDirectoryPrevious") | endif
     catch
         call feedkeys(';', 'n')
     endtry
diff --git a/vim/.vimrc b/vim/.vimrc
index e2f6104..20fe884 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -136,8 +136,8 @@ nnoremap <silent> gh :set opfunc=Call_heytmux<cr>g@
 xnoremap <silent> gh :Heytmux!<cr>
 
 " Iron
+" let g:iron_repl_open_cmd = 'vsplit'
 let g:iron_map_defaults=0
-let g:iron_repl_open_cmd='edit'
 nmap yr <Plug>(iron-send-motion)
 xmap R <Plug>(iron-send-motion)
 nmap yrr VR
-- 
cgit v1.2.3