Merge remote branch 'rammstein/master'

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index a7d81ca6d1bc58dcfa04c818dae2df68981a5159..1a30e83094e3b79c399731437295dcabe49d36da 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -38,26 +38,12 @@ setopt ignoreeof
 bindkey -v
 
 # Also use jj to exit insert mode.
-bindkey -M viins 'jj' vi-cmd-mode
+bindkey 'jj' vi-cmd-mode
 
 # I don't need the arrow keys, I use ^N and ^P for this (see below).
-bindkey -M viins -r '^[OA'
-bindkey -M viins -r '^[OB'
-bindkey -M viins -r '^[OC'
-bindkey -M viins -r '^[OD'
-bindkey -M viins -r '^[[A'
-bindkey -M viins -r '^[[B'
-bindkey -M viins -r '^[[C'
-bindkey -M viins -r '^[[D'
+bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
 # Also not in Vi mode.
-bindkey -M vicmd -r '^[OA'
-bindkey -M vicmd -r '^[OB'
-bindkey -M vicmd -r '^[OC'
-bindkey -M vicmd -r '^[OD'
-bindkey -M vicmd -r '^[[A'
-bindkey -M vicmd -r '^[[B'
-bindkey -M vicmd -r '^[[C'
-bindkey -M vicmd -r '^[[D'
+bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
 
 
 # FUNCTION SETTINGS
@@ -159,7 +145,8 @@ bindkey -a '^N' history-beginning-search-forward
 # Use colorized output, necessary for prompts and completions.
 autoload -U colors && colors
 
-# Some shortcuts for colors.
+# Some shortcuts for colors. The %{...%} tells zsh that the data in between
+# doesn't need any space, necessary for correct prompt draw.
 local red="%{${fg[red]}%}"
 local blue="%{${fg[blue]}%}"
 local green="%{${fg[green]}%}"
@@ -297,7 +284,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             m)
                 program_name=mutt
                 ;;
-            v|vi)
+            v)
                 program_name=vim
                 ;;
         esac
@@ -340,13 +327,13 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         fi
 
         # Prepend prefixes like in window_preexec().
+        if [[ -n $window_root ]]; then
+            name="!$name"
+        fi
         if [[ -n $SSH_CONNECTION ]]; then
-            window_title "@$name"
-        elif [[ -n $window_root ]]; then
-            window_title "!$name"
-        else
-            window_title $name
+            name="@$name"
         fi
+        window_title $name
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
@@ -361,6 +348,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         window_title() {
             print -n "\e]2;$1\e\\"
         }
+    else
+        # Fallback if another TERM is used.
+        window_title() { }
     fi
 
     # Add the preexec() and precmd() hooks.
@@ -412,12 +402,14 @@ zstyle ':completion:*' group-name ''
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
 zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
-# When unsetting variables make sure every variable name is only suggested
-# once.
-zstyle ':completion:*:unset:*' ignore-line yes
-# When working with Mercurial and Git don't complete the same file multiple
-# times. Very useful when completing file names.
-zstyle ':completion:*:(hg|git)*:*' ignore-line yes
+# Always complete one value (file name) only once in the current line. This
+# makes it easy to complete multiple values because I can just press tab to
+# get all possible values. Otherwise I would have to skip the first value
+# again and again.
+zstyle ':completion:*' ignore-line yes
+# Except for mv and cp, because I often want to use to similar names, so I
+# complete to the same and change it.
+zstyle ':completion:*:(mv|cp):*' ignore-line no
 
 
 # CUSTOM ALIASES AND FUNCTIONS
@@ -428,10 +420,12 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 # typing the command.
 #
 # Thanks to Vadim Zeitlin <vz-zsh@zeitlins.org> for a fix (--) so lines
-# starting with - don't cause errors.
+# starting with - don't cause errors; and to Nadav Har'El
+# <nyh@math.technion.ac.il> for a fix (-r) to handle whitespace/quotes
+# correctly, both on the Zsh mailing list.
 TRAPINT() {
     # Store the current buffer in the history.
-    zle && print -s -- $BUFFER
+    zle && print -s -r -- $BUFFER
 
     # Return the default exit code so Zsh aborts the current command.
     return $1
@@ -501,14 +495,16 @@ tig() {
 
 # OS SPECIFIC SETTINGS
 
-if [[ $(uname) == Linux ]]; then
+local uname=$(uname)
+
+if [[ $uname == Linux ]]; then
     # Settings when creating Debian packages.
     DEBEMAIL=simon@ruderich.org
     export DEBEMAIL
     DEBFULLNAME='Simon Ruderich'
     export DEBFULLNAME
 
-elif [[ $(uname) == Darwin ]]; then # Mac OS X
+elif [[ $uname == Darwin ]]; then # Mac OS X
     # Store the current clipboard in CLIPBOARD before every command so it can
     # be used in commands.
     os_darwin_preexec() {