--- a/.zshrc	Sun Oct 27 16:20:49 2013 +0200
+++ b/.zshrc	Tue Oct 29 20:19:23 2013 +0200
@@ -10,16 +10,42 @@
 # Easy cd to often used dirs.
 CDPATH=.:~:~/devel:~/devel/my-devel
 
-HISTFILE=~/.histfile
+HISTFILE=~/.zsh_history
 HISTSIZE=10000
 SAVEHIST=10000
 
-setopt autocd beep extendedglob nomatch notify
+setopt AUTO_CD
+setopt BEEP
+setopt NOMATCH
+setopt NOTIFY
+
+setopt APPEND_HISTORY
+setopt EXTENDED_HISTORY
+setopt HIST_EXPIRE_DUPS_FIRST
+setopt HIST_IGNORE_ALL_DUPS
+setopt HIST_IGNORE_SPACE
+setopt HIST_NO_FUNCTIONS
 
-setopt hist_ignore_all_dups
-setopt append_history
-setopt hist_ignore_space
-setopt hist_no_functions
+setopt MENUCOMPLETE
+# Use completion cache
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache
+
+# Ignore SCM revision files
+zstyle ':completion:*:(all-|)files' ignored-patterns '(|*/)(CVS|.svn|.git)'
+zstyle ':completion:*:cd:*' ignored-patterns '(*/)#(CVS|.svn|.git)'
+
+# Fuzzy completion
+zstyle ':completion:*' completer _expand _complete _match _approximate
+zstyle ':completion:*:match:*' original only
+zstyle ':completion:*:approximate:*' max-errors 1 numeric
+
+# Do not attempt to complete missing commands
+#zstyle ':completion:*:functions' ignored-patterns '_*'
+
+# Complete PIDS with menu
+zstyle ':completion:*:*:kill:*' menu yes select
+zstyle ':completion:*:kill:*' force-list always
 
 autoload -U edit-command-line
 zle -N edit-command-line
@@ -31,9 +57,14 @@
 bindkey "^[[A" history-search-backward
 bindkey "^[[B" history-search-forward
 
+autoload -U zutil
+
 autoload -U compinit
 compinit
 
 # autoload -U promptinit
 # promptinit
 # prompt walters
+
+# Renaming with globbing
+# autoload zmv