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 cf901101a0c070adfccd5fd26695b7275c304765..9c23a0b1ad24e513efc0e1ca1f014f71e35cd46c 100644 (file)
--- 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 22a5e3471528c0873cbe57c3bf4180aa6aed36b6..ccb88e1b2590cead27e77e2034544d641715b018 100644 (file)
--- 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