From: martin f. krafft <madduck@madduck.net>
Date: Tue, 23 Apr 2013 11:28:26 +0000 (+0200)
Subject: Revert "enable vcsprompt to use %-sequences and make vcsh prompt stand out"
X-Git-Url: https://git.madduck.net/etc/zsh.git/commitdiff_plain/850b4a66843eb139ed7bf5ea8779398143060598?ds=inline

Revert "enable vcsprompt to use %-sequences and make vcsh prompt stand out"

This reverts commit d1a7abb4d44890ae6605a73d246b2eaa20a09c08. I cannot
use $psvar[] in the prompt, because that doesn't get expanded at runtime
without PROMPT_SUBST set.

Let's kill that for now.
---

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index cf90110..9c23a0b 100644
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -162,7 +162,7 @@ __vcs_set_prompt_variables()
         # if vcsh is used to get a subshell, then the repo root is the home
         # directory, but we want to indicate the vcsh context too:
         eval set -- $(__vcs_get_prompt_path_components "$HOME" "$branch")
-        set -- "%Svcsh:$VCSH_REPO_NAME%s" "$2" "$3"
+        set -- "vcsh:$VCSH_REPO_NAME" "$2" "$3"
       else
         eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
         if [ -d "$GIT_DIR" ]; then
@@ -200,7 +200,7 @@ __vcs_set_prompt_variables()
       return
   esac
 
-  psvar[1,3]=(${(%)1} ${(%)2} ${(%)3})
+  psvar[1,3]=($1 $2 $3)
 }
 
 __vcs_print_preprompt()
diff --git a/.zsh/zshrc/85_prompt b/.zsh/zshrc/85_prompt
index 22a5e34..ccb88e1 100644
--- a/.zsh/zshrc/85_prompt
+++ b/.zsh/zshrc/85_prompt
@@ -9,7 +9,7 @@
 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then
-  local _MIDDLE="${(%)psvar[1]}%(2v.|%B${(%)psvar[2]}%b|.)%(3v.${(%)psvar[3]}.)"
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
   if is_root; then
     _MIDDLE="%25<…<%~%<<"
     local _PS1_HL=U