From d1a7abb4d44890ae6605a73d246b2eaa20a09c08 Mon Sep 17 00:00:00 2001 From: "martin f. krafft" Date: Tue, 23 Apr 2013 13:17:53 +0200 Subject: [PATCH] enable vcsprompt to use %-sequences and make vcsh prompt stand out --- .zsh/zshrc/60_vcsprompt | 4 ++-- .zsh/zshrc/85_prompt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 9c23a0b..cf90110 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 -- "vcsh:$VCSH_REPO_NAME" "$2" "$3" + set -- "%Svcsh:$VCSH_REPO_NAME%s" "$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 5ddbe82..51fd9b5 100644 --- a/.zsh/zshrc/85_prompt +++ b/.zsh/zshrc/85_prompt @@ -9,7 +9,7 @@ # if [ "${PS1:-}" = '%m%# ' ]; then - local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)" + local _MIDDLE="${(%)psvar[1]}%(2v.|%B${(%)psvar[2]}%b|.)%(3v.${(%)psvar[3]}.)" if is_root; then _MIDDLE="%25<…<%~%<<" local _PS1_HL=U -- 2.39.2