From 690af685ef939307a6dd944c00ece0ae90fc0367 Mon Sep 17 00:00:00 2001
From: matt1003 <matt1003@gmail.com>
Date: Mon, 25 Mar 2019 17:17:04 +1300
Subject: [PATCH 1/2] Ensure VCS is enabled when using segment "vcs_joined"

fixes: https://github.com/bhilburn/powerlevel9k/issues/1116
---
 powerlevel9k.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 4939cb35..9693dd8c 100755
--- 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"; then
+  if segment_in_use "vcs" || segment_in_use "vcs_joined"; then
     powerlevel9k_vcs_init
   fi
 

From 1015b38cf2b32c1f9d2236fdcbc59c3bc6697d33 Mon Sep 17 00:00:00 2001
From: Dominik Ritter <dritter03@googlemail.com>
Date: Sat, 30 Mar 2019 00:05:33 +0100
Subject: [PATCH 2/2] Make check for segments in use take joined segments into
 account

---
 functions/utilities.zsh | 9 ++++-----
 powerlevel9k.zsh-theme  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/functions/utilities.zsh b/functions/utilities.zsh
index 8c18bb44..388eb0e1 100755
--- 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
index 9693dd8c..4939cb35 100755
--- 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