From 04267e2bbcd8e66e48fddc55965321af3a6a9e90 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Thu, 28 Jul 2011 15:43:26 -0400
Subject: [PATCH] Merged correction.zsh into alias.zsh.

---
 functions/alias.zsh      | 18 ++++++++++++++++--
 functions/correction.zsh | 11 -----------
 2 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 functions/correction.zsh

diff --git a/functions/alias.zsh b/functions/alias.zsh
index 2cbe9ad9..bde89ca8 100644
--- a/functions/alias.zsh
+++ b/functions/alias.zsh
@@ -1,3 +1,6 @@
+setopt correct        # Correct commands.
+setopt correct_all    # Correct all arguments.
+
 # The 'ls' Family
 # ------------------------------------------------------------------------------
 if [[ "$DISABLE_COLOR" != 'true' ]]; then
@@ -30,11 +33,16 @@ alias sl='ls'                # I often screw this up.
 
 # General
 # ------------------------------------------------------------------------------
-alias rm='nocorrect rm -i'
+alias cd='nocorrect cd'
 alias cp='nocorrect cp -i'
-alias mv='nocorrect mv -i'
+alias find='noglob find'
+alias gcc='nocorrect gcc'
 alias ln='nocorrect ln -i'
+alias man='nocorrect man'
 alias mkdir='nocorrect mkdir -p'
+alias mv='nocorrect mv -i'
+alias rm='nocorrect rm -i'
+alias scp='nocorrect scp'
 alias du='du -kh'
 alias df='df -kh'
 alias pu='pushd'
@@ -54,6 +62,12 @@ alias pbp='pbpaste'
 alias print-path='echo -e ${PATH//:/\\n}'
 alias t="t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
 
+(( $+commands[ebuild] )) && alias ebuild='nocorrect ebuild'
+(( $+commands[gist] )) && alias gist='nocorrect gist'
+(( $+commands[heroku] )) && alias heroku='nocorrect heroku'
+(( $+commands[hpodder] )) && alias hpodder='nocorrect hpodder'
+(( $+commands[mysql] )) && alias mysql='nocorrect mysql'
+
 if [[ -x "${commands[htop]}" ]]; then
   alias top=htop
 else
diff --git a/functions/correction.zsh b/functions/correction.zsh
deleted file mode 100644
index 5b3c58fe..00000000
--- a/functions/correction.zsh
+++ /dev/null
@@ -1,11 +0,0 @@
-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'
-