zsh: Add new global alias E which performs 2>&1.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 0370fb00d8ddf720ae4949e05551af5ce9f044b2..04acf1e0bb453013d5edf101eb1cf3e27f2164dc 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -137,6 +137,10 @@ fi
 # It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
 # and stumpwm is used (it's tested if stumpish is available) then the window
 # title is also set in stumpwm using stumpish.
+#
+# If a command is run with sudo or if the shell is running as root then a ! is
+# added at the beginning of the command to make this clear. If a command is
+# running on a different computer with ssh a @ is added at the beginning.
 if [[ $TERM == screen* || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
@@ -188,7 +192,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
 
@@ -212,7 +216,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"
@@ -299,10 +303,13 @@ 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'