diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-10-31 09:10:11 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2020-10-31 09:10:11 +0300 |
| commit | 5e2422df50e196d545f5b36ac6533a18326358b5 (patch) | |
| tree | 8cb894a0913d85e8413d508d9d317fc6f0b8a995 | |
| parent | 76e5a692622d79900031be642f074d7e1d0b8412 (diff) | |
fix old/new TTY detection
| -rw-r--r-- | internal/p10k.zsh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/internal/p10k.zsh b/internal/p10k.zsh index 59948730..629d3881 100644 --- a/internal/p10k.zsh +++ b/internal/p10k.zsh @@ -5755,7 +5755,7 @@ _p9k_set_instant_prompt() { [[ -n $RPROMPT ]] || unset RPROMPT } -typeset -gri __p9k_instant_prompt_version=35 +typeset -gri __p9k_instant_prompt_version=36 _p9k_dump_instant_prompt() { local user=${(%):-%n} @@ -5834,8 +5834,7 @@ _p9k_dump_instant_prompt() { local tail=${content##*$rs$key$us} [[ ${#tail} != ${#content} ]] || return local P9K_PROMPT=instant - if [[ $P9K_TTY != old || $_P9K_TTY != $TTY ]]; then - typeset -gx _P9K_TTY=$TTY' + if [[ -z $P9K_TTY || $P9K_TTY == old && -n ${_P9K_TTY:#$TTY} ]]; then' if (( _POWERLEVEL9K_NEW_TTY_MAX_AGE_SECONDS < 0 )); then >&$fd print -r -- ' typeset -gx P9K_TTY=new' else @@ -5850,6 +5849,7 @@ _p9k_dump_instant_prompt() { fi' fi >&$fd print -r -- ' fi + typeset -gx _P9K_TTY=$TTY local -i _p9k__empty_line_i=3 _p9k__ruler_i=3 local -A _p9k_display_k=('${(j: :)${(@q)${(kv)_p9k_display_k}}}') local -a _p9k__display_v=('${(j: :)${(@q)display_v}}') @@ -6430,8 +6430,8 @@ function _p9k_on_expand() { zle -F $_p9k__state_dump_fd _p9k_do_dump fi - if (( ! $+P9K_TTY )) || [[ $_P9K_TTY != $TTY ]]; then - typeset -gx P9K_TTY=old _P9K_TTY=$TTY + if [[ -z $P9K_TTY || $P9K_TTY == old && -n ${_P9K_TTY:#$TTY} ]]; then + typeset -gx P9K_TTY=old if (( _POWERLEVEL9K_NEW_TTY_MAX_AGE_SECONDS < 0 )); then P9K_TTY=new else @@ -6443,6 +6443,8 @@ function _p9k_on_expand() { fi fi + typeset -gx _P9K_TTY=$TTY + __p9k_reset_state=1 if (( _POWERLEVEL9K_PROMPT_ADD_NEWLINE )); then |