zsh: Support @ in window titles when using clear.

diff --git a/zsh/rc b/zsh/rc
index 09ad147020becfb21c9e7550725c3cbc1570830f..429092368f287ef9e066b70d1097732d500bd94c 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -240,12 +240,20 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
+        local name="zsh"
+        # If the function was called with an argument then reset the window
+        # name to '.zsh' (used by clear alias).
+        if [[ -n $1 ]]; then
+            name=".zsh"
+        fi
+
+        # Prepend prefixes like in window_preexec().
         if [[ -n $SSH_CONNECTION ]]; then
-            window_title "@zsh"
+            window_title "@$name"
         elif [[ -n $window_root ]]; then
-            window_title "!zsh"
+            window_title "!$name"
         else
-            window_title "zsh"
+            window_title $name
         fi
 
         # Just reset the name, so no screen reset necessary for the moment.
@@ -401,7 +409,7 @@ function ll() {
 # important. This helps me to remember which windows are empty (I run clear
 # after I finished my work in a window).
 if [[ -n $window_reset ]]; then
-    alias clear='clear; window_title .zsh'
+    alias clear='clear; window_reset=yes; window_precmd reset'
 fi
 
 # I sometimes confuse editor and shell, print a warning to prevent I exit the