diff options
| author | romkatv <roman.perepelitsa@gmail.com> | 2020-05-03 08:05:47 +0300 |
|---|---|---|
| committer | romkatv <roman.perepelitsa@gmail.com> | 2020-05-03 08:05:47 +0300 |
| commit | 9b1353f112dd52d41a582c2ec7b60d03b3cbd6fc (patch) | |
| tree | c13a0ddfbaa766742171827c06c13ac9b02d0689 /internal/p10k.zsh | |
| parent | 1b5ee70b3dfe670fafffabc8da0f31bbff1456a6 (diff) | |
perform single word shell expansions on PROMPT_EOL_MARK (see #683)
Diffstat (limited to 'internal/p10k.zsh')
| -rw-r--r-- | internal/p10k.zsh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 8ba844f3..5e8683e1 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -5576,7 +5576,7 @@ _p9k_set_instant_prompt() { [[ -n $RPROMPT ]] || unset RPROMPT } -typeset -gri __p9k_instant_prompt_version=20 +typeset -gri __p9k_instant_prompt_version=21 _p9k_dump_instant_prompt() { local user=${(%):-%n} @@ -5818,9 +5818,10 @@ _p9k_dump_instant_prompt() { local out' [[ $+VTE_VERSION == 1 || $TERM_PROGRAM == Hyper ]] && >&$fd print -r -- ' if (( ! $+_p9k__g )); then' >&$fd print -r -- ' - [[ $PROMPT_EOL_MARK == "%B%S%#%s%b" ]] && _p9k__ret=1 || _p9k_prompt_length $PROMPT_EOL_MARK + local mark=${(e)PROMPT_EOL_MARK} + [[ $mark == "%B%S%#%s%b" ]] && _p9k__ret=1 || _p9k_prompt_length $mark local -i fill=$((COLUMNS > _p9k__ret ? COLUMNS - _p9k__ret : 0)) - out+="${(%):-%b%k%f%s%u$PROMPT_EOL_MARK${(pl.$fill.. .)}$cr%b%k%f%s%u%E}"' + out+="${(%):-%b%k%f%s%u$mark${(pl.$fill.. .)}$cr%b%k%f%s%u%E}"' [[ $+VTE_VERSION == 1 || $TERM_PROGRAM == Hyper ]] && >&$fd print -r -- ' fi' >&$fd print -r -- ' out+="${(pl.$height..$lf.)}$esc${height}A$terminfo[sc]" @@ -5856,7 +5857,7 @@ _p9k_dump_instant_prompt() { print -rn -- $terminfo[rc]${(%):-%b%k%f%s%u}$terminfo[ed] if [[ -s $__p9k_instant_prompt_output ]]; then cat $__p9k_instant_prompt_output 2>/dev/null - local _p9k__ret mark="${PROMPT_EOL_MARK-%B%S%#%s%b}" + local _p9k__ret mark="${(e)${PROMPT_EOL_MARK-%B%S%#%s%b}}" _p9k_prompt_length $mark local -i fill=$((COLUMNS > _p9k__ret ? COLUMNS - _p9k__ret : 0)) echo -nE - "${(%):-%b%k%f%s%u$mark${(pl.$fill.. .)}$cr%b%k%f%s%u%E}" @@ -6022,7 +6023,7 @@ function _p9k_clear_instant_prompt() { { local content [[ $_POWERLEVEL9K_INSTANT_PROMPT == verbose ]] && content="$(<$__p9k_instant_prompt_output)" - local mark="${PROMPT_EOL_MARK-%B%S%#%s%b}" + local mark="${(e)${PROMPT_EOL_MARK-%B%S%#%s%b}}" _p9k_prompt_length $mark local -i fill=$((COLUMNS > _p9k__ret ? COLUMNS - _p9k__ret : 0)) local cr=$'\r' |