zsh: Load current completions if available.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index e6a27ef5f85aebf98494ee68361d5daf51531f7a..e8792d1b5c24d4fc1d1a26888b5266b94df2fd33 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -34,6 +34,11 @@ setopt ignoreeof
 
 # Make sure every entry in $fpath is unique.
 typeset -U fpath
+# ~/.zsh/functions/completion is a symbolic link to the Completion directory
+# of a Zsh CVS checkout. Use it to get the newest completions if available.
+if [[ -d ~/.zsh/functions/completion ]]; then
+    fpath=(~/.zsh/functions/completion/*/*(/) $fpath)
+fi
 # Set correct fpath to allow loading my functions (including completion
 # functions).
 fpath=(~/.zsh/functions $fpath)
@@ -192,7 +197,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
 
         # Add an exclamation mark at the beginning if running with sudo or if
         # running zsh as root.
-        if [[ $program_sudo == yes || $window_root == yes ]]; then
+        if [[ -n $program_sudo || -n $window_root ]]; then
             program_name=!$program_name
         fi
 
@@ -216,7 +221,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         # Reset the window name to 'zsh'.
         if [[ -n $SSH_CONNECTION ]]; then
             window_title "@zsh"
-        elif [[ $window_root == yes ]]; then
+        elif [[ -n $window_root ]]; then
             window_title "!zsh"
         else
             window_title "zsh"
@@ -303,12 +308,17 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
+# Redirect stderr to stdout.
+alias -g E='2>&1'
+
 # Simplify calls to less, automatically redirects all output.
-alias -g L='2>&1 | less'
+alias -g L='E | less'
 # Simplify calls to colordiff, output is also piped through less.
-alias -g D='2>&1 | colordiff L'
+alias -g D='E | colordiff L'
 # Simplify calls to grep.
 alias -g G='| grep'
+# Simplify calls to sort.
+alias -g S='| sort'
 
 # Automatically use unified diffs.
 alias diff='diff -u'