Merge commit 'rammstein/master'

diff --git a/zsh/rc b/zsh/rc
index 429092368f287ef9e066b70d1097732d500bd94c..f24addea903d738ab9b7baf821bf26b138f97c8e 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -47,7 +47,9 @@ fi
 fpath=(~/.zsh/functions $fpath)
 # Autoload my functions (except completion functions and hidden files). Thanks
 # to caphuso from the Zsh example files for this idea.
-autoload ${fpath[1]}/^_*(^/:t)
+if [[ -d ~/.zsh/functions ]]; then
+    autoload ${fpath[1]}/^_*(^/:t)
+fi
 
 # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
 # the moment only precmd() and preexec() are simulated.
@@ -363,6 +365,7 @@ alias -g L='E | less'
 alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
+alias -g U='| uniq'
 
 # Make going up directories simple.
 alias -g ...='../..'