Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

lib/aliases.zsh

@@ -1,17 +1,9 @@
-#!/bin/zsh
-
 # Push and pop directories on directory stack
 alias pu='pushd'
 alias po='popd'
 
-alias ss='thin --stats "/thin/stats" start'
-alias devlog='tail -f log/development.log'
-
 # Super user
 alias _='sudo'
 
 # Show history
 alias history='fc -l 1'
-
-# TextMate
-alias et='mate . &'

lib/completion.zsh

@@ -25,8 +25,6 @@ zstyle ':completion:*' list-colors ''
 bindkey -M menuselect '^o' accept-and-infer-next-history
 
 zstyle ':completion:*:*:*:*:*' menu select
-# zstyle ':completion:*:*:*:*:processes' force-list always
-
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
 

lib/correction.zsh

@@ -6,3 +6,5 @@ alias mysql='nocorrect mysql'
 alias mkdir='nocorrect mkdir'
 alias gist='nocorrect gist'
 alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'

lib/functions.zsh

@@ -44,13 +44,3 @@ function tab() {
     end tell
 EOF
 }
-
-function take() {
-  mkdir -p $1
-  cd $1
-}
-
-function tm() {
-  cd $1
-  mate $1
-}

lib/history.zsh

@@ -10,6 +10,7 @@ setopt hist_verify
 setopt inc_append_history
 setopt extended_history
 setopt hist_expire_dups_first
+setopt hist_ignore_space
 
 setopt SHARE_HISTORY
 setopt APPEND_HISTORY