X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=1f5e11bcccad3254c3dfdc7c9b693b3a6bbd8d12;hb=7b535ad1bdcf79a03b05091c97b991a1df92b8aa;hp=ae35dcc040bfbb86c9cccf08b7016db36792850b;hpb=38c89a51b82d272fbcdd440bfe646b305c7982ed;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index ae35dcc..1f5e11b 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -166,11 +166,7 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
         esac
 
         # Set the window name to the currently running program.
-        if [[ $TERM == screen ]]; then
-            print -n "\ek$program_name\e\\"
-        elif [[ $TERM == xterm* ]]; then
-            print -n "\e]2;$program_name\e\\"
-        fi
+        window_title "$program_name"
 
         # Tell precmd() to reset the window name when the program stops.
         window_reset=yes
@@ -181,16 +177,21 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        if [[ $TERM == screen ]]; then
-            print -n "\ekzsh\e\\"
-        elif [[ $TERM == xterm* ]]; then
-            print -n "\e]2;zsh\e\\"
-        fi
+        window_title "zsh"
 
         # Just reset the name, so no screen reset necessary for the moment.
         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 window_preexec
     add-zsh-hook precmd window_precmd
@@ -236,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.
@@ -277,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