mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-22 12:20:07 +00:00
make ZLE_RPROMPT_INDENT emulation condition less strict
This commit is contained in:
parent
3434c0e0a9
commit
925ade3d29
1 changed files with 12 additions and 3 deletions
|
@ -3934,6 +3934,13 @@ _p9k_init_lines() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_p9k_all_params_eq() {
|
||||||
|
local key
|
||||||
|
for key in ${parameters[(I)${~1}]}; do
|
||||||
|
[[ ${(P)key} == $2 ]] || return
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
_p9k_init_prompt() {
|
_p9k_init_prompt() {
|
||||||
_p9k_init_lines
|
_p9k_init_lines
|
||||||
|
|
||||||
|
@ -3958,8 +3965,10 @@ _p9k_init_prompt() {
|
||||||
# If affects most terminals when RPROMPT is non-empty and ZLE_RPROMPT_INDENT is zero.
|
# If affects most terminals when RPROMPT is non-empty and ZLE_RPROMPT_INDENT is zero.
|
||||||
# We can work around it as long as RPROMPT ends with a space.
|
# We can work around it as long as RPROMPT ends with a space.
|
||||||
if [[ -n $_p9k_line_segments_right[-1] && $_p9k_line_never_empty_right[-1] == 0 &&
|
if [[ -n $_p9k_line_segments_right[-1] && $_p9k_line_never_empty_right[-1] == 0 &&
|
||||||
$ZLE_RPROMPT_INDENT == 0 && ${POWERLEVEL9K_WHITESPACE_BETWEEN_RIGHT_SEGMENTS:- } == ' ' &&
|
$ZLE_RPROMPT_INDENT == 0 ]] &&
|
||||||
-z "$(typeset -m 'POWERLEVEL9K_*(RIGHT_RIGHT_WHITESPACE|RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL)')" ]] &&
|
_p9k_all_params_eq 'POWERLEVEL9K_*WHITESPACE_BETWEEN_RIGHT_SEGMENTS' ' ' &&
|
||||||
|
_p9k_all_params_eq 'POWERLEVEL9K_*RIGHT_RIGHT_WHITESPACE' ' ' &&
|
||||||
|
_p9k_all_params_eq 'POWERLEVEL9K_*RIGHT_PROMPT_LAST_SEGMENT_END_SYMBOL' '' &&
|
||||||
! is-at-least 5.7.2; then
|
! is-at-least 5.7.2; then
|
||||||
_p9k_emulate_zero_rprompt_indent=1
|
_p9k_emulate_zero_rprompt_indent=1
|
||||||
_p9k_prompt_prefix_left+='${${:-${_p9k_real_zle_rprompt_indent:=$ZLE_RPROMPT_INDENT}${ZLE_RPROMPT_INDENT::=1}${_p9k_ind::=0}}+}'
|
_p9k_prompt_prefix_left+='${${:-${_p9k_real_zle_rprompt_indent:=$ZLE_RPROMPT_INDENT}${ZLE_RPROMPT_INDENT::=1}${_p9k_ind::=0}}+}'
|
||||||
|
|
Loading…
Reference in a new issue