X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=1a30e83094e3b79c399731437295dcabe49d36da;hb=0388e4464474e155fd41d18266813d9ac5795cac;hp=6fcc820c9e5e2fda8064c0b3e39768939ce3ec00;hpb=817179a8ad182e22b0aecf883926982743e0f26b;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 6fcc820..1a30e83 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -145,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]}%}"
@@ -283,7 +284,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             m)
                 program_name=mutt
                 ;;
-            v|vi)
+            v)
                 program_name=vim
                 ;;
         esac
@@ -401,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
@@ -492,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() {