Make check for segments in use take joined segments into account

Powerlevel9k · Mar 29, 2019 · 1015b38 · romkatv · Apr 4, 2019 · 1015b38
1 parent 690af68
commit 1015b38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/functions/utilities.zsh b/functions/utilities.zsh
@@ -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.

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
@@ -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