X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=62b4a58fe1a66d73b56c63480660ef58fb4ecaf5;hb=2f0e82c8076be08e8305d85737e8974c8af478e9;hp=77b9f3cd047ad6907c786c7bc5a2e1245b406bd8;hpb=25a51e73e249fbb0fc4e0d904abbbb458f741cf5;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 77b9f3c..62b4a58 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -150,8 +150,8 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     fi
 fi
 
-# When screen or xterm is used set the name of the window to the currently
-# running program.
+# When screen, xterm or rxvt 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 window's name to 'zsh'.
@@ -164,7 +164,7 @@ fi
 # 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. This
 # only works if the .zshrc on the server also uses this command.
-if [[ $TERM == screen* || $TERM == xterm* ]]; then
+if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     # Is set to a non empty value to reset the window name in the next
     # precmd() call.
     window_reset=yes
@@ -249,7 +249,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         window_reset=
     }
 
-    # Sets the window title. Works with screen and xterm.
+    # Sets the window title. Works with screen, xterm and rxvt.
     window_title() {
         if [[ $TERM == screen* ]]; then
             print -n "\ek$1\e\\"
@@ -260,7 +260,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
                 echo "$1" | stumpish -e "title" > /dev/null
             fi
 
-        elif [[ $TERM == xterm* ]]; then
+        elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
             print -n "\e]2;$1\e\\"
         fi
     }
@@ -270,15 +270,6 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
     add-zsh-hook precmd window_precmd
 fi
 
-# If the window naming feature is used (see above) then use ".zsh" (leading
-# dot) as title name after running clear so it's clear to me that the window
-# is empty. I open so much windows that I don't know in which I have something
-# 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'
-fi
-
 
 # COMPLETION SETTINGS
 
@@ -336,9 +327,12 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 # easily retrieved later and then abort like ^C normally does. This is useful
 # when I want to abort an command to do something in between and then finish
 # typing the command.
+#
+# Thanks to Vadim Zeitlin <vz-zsh@zeitlins.org> for a fix (--) so lines
+# starting with - don't cause errors.
 TRAPINT() {
     # Store the current buffer in the history.
-    zle && print -s $BUFFER
+    zle && print -s -- $BUFFER
 
     # Return the default exit code so zsh aborts the current command.
     return $1
@@ -398,6 +392,15 @@ function ll() {
     la -l $*
 }
 
+# If the window naming feature is used (see above) then use ".zsh" (leading
+# dot) as title name after running clear so it's clear to me that the window
+# is empty. I open so much windows that I don't know in which I have something
+# 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'
+fi
+
 # I sometimes confuse editor and shell, print a warning to prevent I exit the
 # shell.
 alias :q='echo "This is not Vim!" >&2'