From ae5b8b535771b1b0ece49c11888e8a752cb31934 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Mon, 12 Mar 2012 13:04:20 +0800 Subject: [PATCH] Fixed conditions for keybindings --- lib/git/aliases_and_bindings.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/git/aliases_and_bindings.sh b/lib/git/aliases_and_bindings.sh index 8b14900..b96b3ce 100644 --- a/lib/git/aliases_and_bindings.sh +++ b/lib/git/aliases_and_bindings.sh @@ -161,7 +161,7 @@ if [[ "$git_keyboard_shortcuts_enabled" = "true" ]]; then case "$TERM" in xterm*|rxvt*) # Uses emacs style keybindings, so vi mode is not supported for now - if ! [[ $shell == "bash" ]] || set -o | grep -q '^vi .*on$'; then + if ! [[ $shell == "bash" ]] || ! set -o | grep -q '^vi .*on$'; then _bind "$git_commit_all_keys" "\" git_commit_all\n\"" _bind "$git_add_and_commit_keys" "\"\e[1~ git_add_and_commit \n\"" fi @@ -179,7 +179,7 @@ fi #~ for cmd in vim cat cd rm cp mv ln; do #~ alias $cmd="exec_git_expand_args $cmd" #~ done -#~ +#~ #~ if [[ "$(type ls)" =~ "--color=auto" ]]; then #~ alias ls="exec_git_expand_args ls --color=auto" #~ else