Expand aliases when using sudo.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 3c4234be89931d95530895a2f9d9011e56e691c8..1f5e11bcccad3254c3dfdc7c9b693b3a6bbd8d12 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -123,17 +123,17 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
     RPROMPT='${vcs_info_msg_0_}'
 fi
 
-# When screen is used set the name of the window to the currently running
-# program.
+# When screen or xterm is used set the name of the window to the currently
+# running program.
 #
 # When a program is started preexec() sets the window's name to it; when it
 # stops precmd() resets the windows' name to 'zsh'.
-if [[ $TERM == screen ]]; then
+if [[ $TERM == screen || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
-    screen_name_reset=yes
+    window_reset=yes
 
-    screen_preexec() {
+    window_preexec() {
         # Get the program name with its arguments.
         local program_name=$1
         # When sudo is used use real program name instead, but with an
@@ -166,26 +166,35 @@ if [[ $TERM == screen ]]; then
         esac
 
         # Set the window name to the currently running program.
-        print -n "\ek$program_name\e\\"
+        window_title "$program_name"
 
         # Tell precmd() to reset the window name when the program stops.
-        screen_name_reset=yes
+        window_reset=yes
     }
 
-    screen_precmd() {
+    window_precmd() {
         # Abort if no window name reset is necessary.
-        [[ -z $screen_name_reset ]] && return
+        [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        print -n "\ekzsh\e\\"
+        window_title "zsh"
 
         # Just reset the name, so no screen reset necessary for the moment.
-        screen_name_reset=
+        window_reset=
+    }
+
+    # Sets the window title. Works with screen and xterm.
+    window_title() {
+        if [[ $TERM == screen ]]; then
+            print -n "\ek$1\e\\"
+        elif [[ $TERM == xterm* ]]; then
+            print -n "\e]2;$1\e\\"
+        fi
     }
 
     # Add the preexec() and precmd() hooks.
-    add-zsh-hook preexec screen_preexec
-    add-zsh-hook precmd screen_precmd
+    add-zsh-hook preexec window_preexec
+    add-zsh-hook precmd window_precmd
 fi
 
 
@@ -228,6 +237,9 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 # CUSTOM ALIASES AND FUNCTIONS
 
+# Make sure aliases are expanded when using sudo.
+alias sudo='sudo '
+
 # Simplify calls to less, automatically redirects all output.
 alias -g L='2>&1 | less'
 # Simplify calls to colordiff, output is also piped through less.
@@ -269,8 +281,9 @@ alias -g ...='../..'
 alias -g ....='../../..'
 alias -g .....='../../../..'
 
-# Improved ls which displays the files in columns (-C), visualizes directories,
-# links and other special files (-F) and pages everything through less (L).
+# Improved ls which displays the files in columns (-C), visualizes
+# directories, links and other special files (-F) and pages everything through
+# less (L).
 #
 # If available use GNU ls with colorized output. If it isn't available use
 # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
@@ -320,3 +333,5 @@ source_config ~/.zsh os rc $(uname) nolocal
 source_config ~/.zsh host rc ${$(hostname)//.*/}
 
 source_debug "finished sourcing ~/.zsh/rc"
+
+# vim: ft=zsh