several fixes for #550

- remove $fg where it has no effect (minor optimization)
- add $style after $subsep if the latter has embedded styling (bug fix)
- bump version to invalidated cached styles
pull/554/head
romkatv 5 years ago
parent d7d3df8753
commit 38d717db26

@ -684,7 +684,7 @@ _p9k_left_prompt_segment() {
fi fi
_p9k_t+=%b$bg$_p9k__ret$ss$style$left_space # 3 _p9k_t+=%b$bg$_p9k__ret$ss$style$left_space # 3
else else
_p9k_t+=%b$bg$ss$fg$style$left_space # 3 _p9k_t+=%b$bg$ss$style$left_space # 3
fi fi
_p9k_t+=%b$bg$s$style$left_space # 4 _p9k_t+=%b$bg$s$style$left_space # 4
@ -892,6 +892,8 @@ _p9k_right_prompt_segment() {
local right_space_=$_p9k__ret local right_space_=$_p9k__ret
[[ $right_space_ == *%* ]] && right_space_+=$style_ [[ $right_space_ == *%* ]] && right_space_+=$style_
[[ $subsep == *%* ]] && subsep+=$style
local w='<_p9k__w>' s='<_p9k__s>' local w='<_p9k__w>' s='<_p9k__s>'
local -i non_hermetic=0 local -i non_hermetic=0
@ -7432,7 +7434,7 @@ _p9k_must_init() {
[[ $sig == $_p9k__param_sig ]] && return 1 [[ $sig == $_p9k__param_sig ]] && return 1
_p9k_deinit _p9k_deinit
fi fi
_p9k__param_pat=$'v68\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1' _p9k__param_pat=$'v69\1'${ZSH_VERSION}$'\1'${ZSH_PATCHLEVEL}$'\1'
_p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1' _p9k__param_pat+=$'${#parameters[(I)POWERLEVEL9K_*]}\1${(%):-%n%#}\1$GITSTATUS_LOG_LEVEL\1'
_p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1' _p9k__param_pat+=$'$GITSTATUS_ENABLE_LOGGING\1$GITSTATUS_DAEMON\1$GITSTATUS_NUM_THREADS\1'
_p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays' _p9k__param_pat+=$'$DEFAULT_USER\1${ZLE_RPROMPT_INDENT:-1}\1$P9K_SSH\1$__p9k_ksh_arrays'

Loading…
Cancel
Save