Merge branch 'master' into instant-prompt

3 files changed, 5 insertions, 6 deletions

diff --git a/gitstatus/bin/gitstatusd-darwin-x86_64 b/gitstatus/bin/gitstatusd-darwin-x86_64
index fb4e4a02..09eeac8d 100755
--- a/gitstatus/bin/gitstatusd-darwin-x86_64
+++ b/gitstatus/bin/gitstatusd-darwin-x86_64
diff --git a/gitstatus/bin/gitstatusd-linux-x86_64 b/gitstatus/bin/gitstatusd-linux-x86_64
index 36691cf4..5538aa05 100755
--- a/gitstatus/bin/gitstatusd-linux-x86_64
+++ b/gitstatus/bin/gitstatusd-linux-x86_64
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index c2506a0a..97ccb271 100644
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -91,7 +91,7 @@ function getColorCode() {
   emulate -L zsh
   setopt no_hist_expand extended_glob no_prompt_bang prompt_{percent,subst}
   if (( ARGC == 1 )); then
-    case $1 in 
+    case $1 in
       foreground)
         local k
         for k in "${(k@)__p9k_colors}"; do
@@ -457,11 +457,10 @@ _p9k_background() {
 }
 
 _p9k_foreground() {
-  case $1 in
-    '')   _p9k_ret="%f";;
-    '#'*) _p9k_ret="%F{$1}";;
-    *)    _p9k_ret="%${1}F";;
-  esac
+  # Note: This code used to produce `%1F` instead of `%F{1}` because it's more efficient.
+  # Unfortunately, this triggers a bug in zsh. Namely, `%1F{2}` gets percent-expanded as if
+  # it was `%F{2}`.
+  [[ -n $1 ]] && _p9k_ret="%F{$1}" || _p9k_ret="%k"
 }
 
 _p9k_escape_style() {