X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=80178e0cdc57194f6c66d6db910b97055ec68e04;hb=acfeea45e718eeecec36fea55f0ea8037ee6aef5;hp=635ea6df8489b7dbb11818c4c0fd8e3d85d25c0c;hpb=7878dcf9328658f8d6b1755fdb143ef9877b93cc;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 635ea6d..80178e0 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -165,9 +165,6 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
               $fpath)
     fi
 
-    # Allow substitutions and expansions in the prompt, necessary for
-    # vcs_info.
-    setopt promptsubst
     # Load vcs_info to display information about version control repositories.
     autoload -Uz vcs_info
     # Only look for git and mercurial repositories; the only I use.
@@ -241,17 +238,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     }
     add-zsh-hook chpwd prompt_chpwd
 
-
-    # Display the VCS information in the right prompt.
-    if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
-        RPROMPT='${vcs_info_msg_0_}'
-    # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when
-    # ${vcs_info_msg_0_} is empty. Provide a workaround for those versions,
-    # thanks to Frank Terbeck <ft@bewatermyfriend.org> for it.
-    else
-        RPROMPT='${vcs_info_msg_0_:- }'
-    fi
-
+    # Used by prompt code below to determine if vcs_info should be run.
     RUN_VCS_INFO=1
 else
     RUN_VCS_INFO=
@@ -267,6 +254,16 @@ prompt_precmd() {
     # Call vcs_info before every prompt.
     if [[ -n $RUN_VCS_INFO ]]; then
         vcs_info
+
+        # Display the VCS information in the right prompt.
+        if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
+            RPROMPT="${vcs_info_msg_0_}"
+        # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when
+        # ${vcs_info_msg_0_} is empty. Provide a workaround for those
+        # versions, thanks to Frank Terbeck <ft@bewatermyfriend.org> for it.
+        else
+            RPROMPT="${vcs_info_msg_0_:- }"
+        fi
     fi
 
     PROMPT="$green%B%m%b$default:$blue%B%~%b$default \