Permalink
Browse files

Resolving conflict in #1266 merge

  • Loading branch information...
2 parents 7cdb6d6 + 682961e commit a2c8db9eb34480dd3e2c9d91d4415ee7964d4764 @robbyrussell committed Apr 24, 2013
Showing with 17 additions and 2 deletions.
  1. +14 −2 lib/correction.zsh
  2. +3 −0 templates/zshrc.zsh-template
View
@@ -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
@@ -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"

0 comments on commit a2c8db9

Please sign in to comment.