From 58c40aed3feeeeccfd5ba9803e3619864a4e38f8 Mon Sep 17 00:00:00 2001
From: Simon Let <simon.a.let@gmail.com>
Date: Fri, 20 Dec 2019 17:57:29 +0100
Subject: [PATCH] experimental vim cmd mode fix

---
 scripts/reshctl.sh                 | 6 ++++++
 submodules/bash-zsh-compat-widgets | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/reshctl.sh b/scripts/reshctl.sh
index f7957c1..f836163 100644
--- a/scripts/reshctl.sh
+++ b/scripts/reshctl.sh
@@ -13,10 +13,14 @@ __resh_bind_arrows() {
     __RESH_bindfunc_revert_arrow_up_bind=$_bindfunc_revert
     bindfunc --revert '\e[A' __resh_widget_arrow_up_compat
     __RESH_bindfunc_revert_arrow_up_bind_vim=$_bindfunc_revert
+    bindfunc --vim-cmd --revert 'k' __resh_widget_arrow_up_compat
+    __RESH_bindfunc_revert_k_bind_vim=$_bindfunc_revert
     bindfunc --revert '\eOB' __resh_widget_arrow_down_compat
     __RESH_bindfunc_revert_arrow_down_bind=$_bindfunc_revert
     bindfunc --revert '\e[B' __resh_widget_arrow_down_compat
     __RESH_bindfunc_revert_arrow_down_bind_vim=$_bindfunc_revert
+    bindfunc --vim-cmd --revert 'j' __resh_widget_arrow_down_compat
+    __RESH_bindfunc_revert_j_bind_vim=$_bindfunc_revert
     __RESH_arrow_keys_bind_enabled=1
     return 0
 }
@@ -38,6 +42,7 @@ __resh_unbind_arrows() {
     else
         eval "$__RESH_bindfunc_revert_arrow_up_bind"
         [ -z "${__RESH_bindfunc_revert_arrow_up_bind_vim+x}" ] || eval "$__RESH_bindfunc_revert_arrow_up_bind_vim"
+        [ -z "${__RESH_bindfunc_revert_k_bind_vim+x}" ] || eval "$__RESH_bindfunc_revert_k_bind_vim"
         echo "RESH arrow up binding successfully disabled"
         __RESH_arrow_keys_bind_enabled=0
     fi
@@ -47,6 +52,7 @@ __resh_unbind_arrows() {
     else
         eval "$__RESH_bindfunc_revert_arrow_down_bind"
         [ -z "${__RESH_bindfunc_revert_arrow_down_bind_vim+x}" ] || eval "$__RESH_bindfunc_revert_arrow_down_bind_vim"
+        [ -z "${__RESH_bindfunc_revert_j_bind_vim+x}" ] || eval "$__RESH_bindfunc_revert_j_bind_vim"
         echo "RESH arrow down binding successfully disabled"
         __RESH_arrow_keys_bind_enabled=0
     fi
diff --git a/submodules/bash-zsh-compat-widgets b/submodules/bash-zsh-compat-widgets
index c3077fc..11779d7 160000
--- a/submodules/bash-zsh-compat-widgets
+++ b/submodules/bash-zsh-compat-widgets
@@ -1 +1 @@
-Subproject commit c3077fcdf2e20efb95dd27a53766b78533ab7bc4
+Subproject commit 11779d7cf3dce038b0068f0d8405f8b655a7ea77