Resolving conflict in #1266 merge

This commit is contained in:
Robby Russell 2013-04-23 20:30:21 -07:00
commit a2c8db9eb3
2 changed files with 17 additions and 2 deletions

View File

@ -1,2 +1,14 @@
# correct commands, but not any arguments (correct_all would do that)
setopt correct
if [[ "$DISABLE_CORRECTION" == "true" ]]; then
return
else
setopt correct_all
alias man='nocorrect man'
alias mv='nocorrect mv'
alias mysql='nocorrect mysql'
alias mkdir='nocorrect mkdir'
alias gist='nocorrect gist'
alias heroku='nocorrect heroku'
alias ebuild='nocorrect ebuild'
alias hpodder='nocorrect hpodder'
fi

View File

@ -26,6 +26,9 @@ ZSH_THEME="robbyrussell"
# Uncomment following line if you want to disable autosetting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment following line if you want to disable command autocorrection
# DISABLE_CORRECTION="true"
# Uncomment following line if you want red dots to be displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true"