Make check for segments in use take joined segments into account

This commit is contained in:
Dominik Ritter 2019-03-30 00:05:33 +01:00
parent 690af685ef
commit 1015b38cf2
2 changed files with 5 additions and 6 deletions

View file

@ -202,11 +202,10 @@ fi
# * $1: The segment to be tested.
segment_in_use() {
local key=$1
if [[ -n "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[(r)$key]}" ]] || [[ -n "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[(r)$key]}" ]]; then
return 0
else
return 1
fi
[[ -n "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[(r)${key}]}" ||
-n "${POWERLEVEL9K_LEFT_PROMPT_ELEMENTS[(r)${key}_joined]}" ||
-n "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[(r)${key}]}" ||
-n "${POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS[(r)${key}_joined]}" ]]
}
# Print a deprecation warning if an old segment is in use.

View file

@ -1910,7 +1910,7 @@ prompt_powerlevel9k_setup() {
# initialize colors
autoload -U colors && colors
if segment_in_use "vcs" || segment_in_use "vcs_joined"; then
if segment_in_use "vcs"; then
powerlevel9k_vcs_init
fi