X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=ee2737b833a4c5976dc378119baa06872d882c0f;hb=e88bcead0b83f3d5bf2507f971e5c9d27417c9fc;hp=73cf71ac16d0ad4d0ed33e3fbb273f9fa9ccde13;hpb=e516e20937e39bfc14b7b8481a435f72c3415a87;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 73cf71a..ee2737b 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -271,7 +271,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             m)
                 program_name=mutt
                 ;;
-            v|vi)
+            v)
                 program_name=vim
                 ;;
         esac
@@ -386,12 +386,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
@@ -474,14 +476,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() {