From 6931c9707c025eacaea422b996785a742d5da0d6 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 12:32:42 +0200
Subject: [PATCH 1/3] Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in
 zshrc template

Since commands auto-correction must be explicitly enable with
the ENABLE_CORRECTION envvar, this commit replaces the unaccurate
example in the zshrc template.
---
 templates/zshrc.zsh-template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 5b2a6cf49..e08c13912 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -26,8 +26,8 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following line to disable auto-setting terminal title.
 # DISABLE_AUTO_TITLE="true"
 
-# Uncomment the following line to disable command auto-correction.
-# DISABLE_CORRECTION="true"
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
 # COMPLETION_WAITING_DOTS="true"

From 37ea61a97168443f45fa2b2413c1a6a3e110a884 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 18:13:19 +0200
Subject: [PATCH 2/3] Defining nocorrect aliases only when ENABLE_CORRECTION is
 "true"

This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
---
 lib/correction.zsh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 47eb83b1d..35771474f 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,13 +1,13 @@
-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'
-alias sudo='nocorrect sudo'
-
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
+  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'
+  alias sudo='nocorrect sudo'
+
   setopt correct_all
 fi

From cb44bbe63c4a42ef25d66c350ff474fbd238b9c0 Mon Sep 17 00:00:00 2001
From: Simon Courtois <scourtois_github@cubyx.fr>
Date: Wed, 9 Apr 2014 18:16:57 +0200
Subject: [PATCH 3/3] Ordering nocorrect aliases alphabetically

---
 lib/correction.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index 35771474f..3e1415a0b 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -1,12 +1,12 @@
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
-  alias man='nocorrect man'
-  alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
-  alias mkdir='nocorrect mkdir'
+  alias ebuild='nocorrect ebuild'
   alias gist='nocorrect gist'
   alias heroku='nocorrect heroku'
-  alias ebuild='nocorrect ebuild'
   alias hpodder='nocorrect hpodder'
+  alias man='nocorrect man'
+  alias mkdir='nocorrect mkdir'
+  alias mv='nocorrect mv'
+  alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
 
   setopt correct_all