experimental vim cmd mode fix

pull/58/head
Simon Let 6 years ago
parent 06e2332bdd
commit 58c40aed3f
  1. 6
      scripts/reshctl.sh
  2. 2
      submodules/bash-zsh-compat-widgets

@ -13,10 +13,14 @@ __resh_bind_arrows() {
__RESH_bindfunc_revert_arrow_up_bind=$_bindfunc_revert __RESH_bindfunc_revert_arrow_up_bind=$_bindfunc_revert
bindfunc --revert '\e[A' __resh_widget_arrow_up_compat bindfunc --revert '\e[A' __resh_widget_arrow_up_compat
__RESH_bindfunc_revert_arrow_up_bind_vim=$_bindfunc_revert __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 bindfunc --revert '\eOB' __resh_widget_arrow_down_compat
__RESH_bindfunc_revert_arrow_down_bind=$_bindfunc_revert __RESH_bindfunc_revert_arrow_down_bind=$_bindfunc_revert
bindfunc --revert '\e[B' __resh_widget_arrow_down_compat bindfunc --revert '\e[B' __resh_widget_arrow_down_compat
__RESH_bindfunc_revert_arrow_down_bind_vim=$_bindfunc_revert __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 __RESH_arrow_keys_bind_enabled=1
return 0 return 0
} }
@ -38,6 +42,7 @@ __resh_unbind_arrows() {
else else
eval "$__RESH_bindfunc_revert_arrow_up_bind" 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_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" echo "RESH arrow up binding successfully disabled"
__RESH_arrow_keys_bind_enabled=0 __RESH_arrow_keys_bind_enabled=0
fi fi
@ -47,6 +52,7 @@ __resh_unbind_arrows() {
else else
eval "$__RESH_bindfunc_revert_arrow_down_bind" 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_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" echo "RESH arrow down binding successfully disabled"
__RESH_arrow_keys_bind_enabled=0 __RESH_arrow_keys_bind_enabled=0
fi fi

@ -1 +1 @@
Subproject commit c3077fcdf2e20efb95dd27a53766b78533ab7bc4 Subproject commit 11779d7cf3dce038b0068f0d8405f8b655a7ea77
Loading…
Cancel
Save