Merge branch 'master' into instant-prompt

5 years ago · 4536dc2a27
parent 41084c089e aa53902281
commit 4536dc2a27
3 changed files with 5 additions and 6 deletions
--- a/gitstatus/bin/gitstatusd-darwin-x86_64
+++ b/gitstatus/bin/gitstatusd-darwin-x86_64
--- a/gitstatus/bin/gitstatusd-linux-x86_64
+++ b/gitstatus/bin/gitstatusd-linux-x86_64
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@ -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() {