Fixed conditions for keybindings

This commit is contained in:
Nathan Broadbent
2012-03-12 13:04:20 +08:00
parent ab7865867d
commit ae5b8b5357

View File

@@ -161,7 +161,7 @@ if [[ "$git_keyboard_shortcuts_enabled" = "true" ]]; then
case "$TERM" in case "$TERM" in
xterm*|rxvt*) xterm*|rxvt*)
# Uses emacs style keybindings, so vi mode is not supported for now # 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_commit_all_keys" "\" git_commit_all\n\""
_bind "$git_add_and_commit_keys" "\"\e[1~ git_add_and_commit \n\"" _bind "$git_add_and_commit_keys" "\"\e[1~ git_add_and_commit \n\""
fi fi
@@ -179,7 +179,7 @@ fi
#~ for cmd in vim cat cd rm cp mv ln; do #~ for cmd in vim cat cd rm cp mv ln; do
#~ alias $cmd="exec_git_expand_args $cmd" #~ alias $cmd="exec_git_expand_args $cmd"
#~ done #~ done
#~ #~
#~ if [[ "$(type ls)" =~ "--color=auto" ]]; then #~ if [[ "$(type ls)" =~ "--color=auto" ]]; then
#~ alias ls="exec_git_expand_args ls --color=auto" #~ alias ls="exec_git_expand_args ls --color=auto"
#~ else #~ else