Tack-Support
/
powerlevel10k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into reactive

Browse Source
pull/436/head
romkatv 5 years ago
parent 0be72e33f1 d77bc5fa46
commit 9f83e5e1dc
1 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File

91
internal/p10k.zsh
Unescape Escape View File

@ -3905,7 +3905,7 @@ _p9k_set_instant_prompt() {
RPROMPT=$saved_rprompt RPROMPT=$saved_rprompt
} }
typeset -gri __p9k_instant_prompt_version=13 typeset -gri __p9k_instant_prompt_version=14
_p9k_dump_instant_prompt() { _p9k_dump_instant_prompt() {
local user=${(%):-%n} local user=${(%):-%n}
@ -4131,6 +4131,7 @@ _p9k_dump_instant_prompt() {
precmd_functions=(${(@)precmd_functions:#_p9k_instant_prompt_precmd_first}) precmd_functions=(${(@)precmd_functions:#_p9k_instant_prompt_precmd_first})
} }
precmd_functions=(_p9k_instant_prompt_precmd_first $precmd_functions) precmd_functions=(_p9k_instant_prompt_precmd_first $precmd_functions)
DISABLE_UPDATE_PROMPT=true
} && unsetopt prompt_cr prompt_sp || true' } && unsetopt prompt_cr prompt_sp || true'
} always { } always {
exec {fd}>&- exec {fd}>&-
@ -4273,47 +4274,53 @@ function _p9k_clear_instant_prompt() {
local cr=$'\r' local cr=$'\r'
local sp="${(%):-%b%k%f%s%u$mark${(pl.$fill.. .)}$cr%b%k%f%s%u%E}" local sp="${(%):-%b%k%f%s%u$mark${(pl.$fill.. .)}$cr%b%k%f%s%u%E}"
print -rn -- $terminfo[rc]${(%):-%b%k%f%s%u}$terminfo[ed] print -rn -- $terminfo[rc]${(%):-%b%k%f%s%u}$terminfo[ed]
if [[ -n ${(S)content//$'\e'*($'\a'|$'\e\\')} ]]; then local unexpected=${(S)content//$'\e'*($'\a'|$'\e\\')}
echo -E - "" if [[ -n $unexpected ]]; then
echo -E - "${(%):-[%3FWARNING%f]: Console output during zsh initialization detected.}" local omz1='[Oh My Zsh] Would you like to update? [Y/n]: '
echo -E - "" local omz2='Updating Oh My Zsh'
echo -E - "${(%):-When using Powerlevel10k with instant prompt, console output during zsh}" local omz3='https://shop.planetargon.com/collections/oh-my-zsh'
echo -E - "${(%):-initialization may indicate issues.}" if [[ -n ${${unexpected/$omz1}/$omz2*$omz3($'\n'|)} ]]; then
echo -E - "" echo -E - ""
echo -E - "${(%):-You can:}" echo -E - "${(%):-[%3FWARNING%f]: Console output during zsh initialization detected.}"
echo -E - "" echo -E - ""
echo -E - "${(%):- - %BRecommended%b: Change %B$__p9k_zshrc_u%b so that it does not perform console I/O}" echo -E - "${(%):-When using Powerlevel10k with instant prompt, console output during zsh}"
echo -E - "${(%):- after the instant prompt preamble. See the link below for details.}" echo -E - "${(%):-initialization may indicate issues.}"
echo -E - "" echo -E - ""
echo -E - "${(%):- * You %Bwill not%b see this error message again.}" echo -E - "${(%):-You can:}"
echo -E - "${(%):- * Zsh will start %Bquickly%b and prompt will update %Bsmoothly%b.}" echo -E - ""
echo -E - "" echo -E - "${(%):- - %BRecommended%b: Change %B$__p9k_zshrc_u%b so that it does not perform console I/O}"
echo -E - "${(%):- - Suppress this warning either by running %Bp10k configure%b or by manually}" echo -E - "${(%):- after the instant prompt preamble. See the link below for details.}"
echo -E - "${(%):- defining the following parameter:}" echo -E - ""
echo -E - "" echo -E - "${(%):- * You %Bwill not%b see this error message again.}"
echo -E - "${(%):- %3Ftypeset%f -g POWERLEVEL9K_INSTANT_PROMPT=quiet}" echo -E - "${(%):- * Zsh will start %Bquickly%b and prompt will update %Bsmoothly%b.}"
echo -E - "" echo -E - ""
echo -E - "${(%):- * You %Bwill not%b see this error message again.}" echo -E - "${(%):- - Suppress this warning either by running %Bp10k configure%b or by manually}"
echo -E - "${(%):- * Zsh will start %Bquickly%b but prompt will %Bjump down%b after initialization.}" echo -E - "${(%):- defining the following parameter:}"
echo -E - "" echo -E - ""
echo -E - "${(%):- - Disable instant prompt either by running %Bp10k configure%b or by manually}" echo -E - "${(%):- %3Ftypeset%f -g POWERLEVEL9K_INSTANT_PROMPT=quiet}"
echo -E - "${(%):- defining the following parameter:}" echo -E - ""
echo -E - "" echo -E - "${(%):- * You %Bwill not%b see this error message again.}"
echo -E - "${(%):- %3Ftypeset%f -g POWERLEVEL9K_INSTANT_PROMPT=off}" echo -E - "${(%):- * Zsh will start %Bquickly%b but prompt will %Bjump down%b after initialization.}"
echo -E - "" echo -E - ""
echo -E - "${(%):- * You %Bwill not%b see this error message again.}" echo -E - "${(%):- - Disable instant prompt either by running %Bp10k configure%b or by manually}"
echo -E - "${(%):- * Zsh will start %Bslowly%b.}" echo -E - "${(%):- defining the following parameter:}"
echo -E - "" echo -E - ""
echo -E - "${(%):- - Do nothing.}" echo -E - "${(%):- %3Ftypeset%f -g POWERLEVEL9K_INSTANT_PROMPT=off}"
echo -E - "" echo -E - ""
echo -E - "${(%):- * You %Bwill%b see this error message every time you start zsh.}" echo -E - "${(%):- * You %Bwill not%b see this error message again.}"
echo -E - "${(%):- * Zsh will start %Bquickly%b but prompt will %Bjump down%b after initialization.}" echo -E - "${(%):- * Zsh will start %Bslowly%b.}"
echo -E - "" echo -E - ""
echo -E - "${(%):-For details, see:}" echo -E - "${(%):- - Do nothing.}"
echo - "${(%):-\e]8;;https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt\ahttps://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt\e]8;;\a}" echo -E - ""
echo -E - "" echo -E - "${(%):- * You %Bwill%b see this error message every time you start zsh.}"
echo - "${(%):-%3F-- console output produced during zsh initialization follows --%f}" echo -E - "${(%):- * Zsh will start %Bquickly%b but prompt will %Bjump down%b after initialization.}"
echo -E - "" echo -E - ""
echo -E - "${(%):-For details, see:}"
echo - "${(%):-\e]8;;https://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt\ahttps://github.com/romkatv/powerlevel10k/blob/master/README.md#instant-prompt\e]8;;\a}"
echo -E - ""
echo - "${(%):-%3F-- console output produced during zsh initialization follows --%f}"
echo -E - ""
fi
fi fi
cat $__p9k_instant_prompt_output cat $__p9k_instant_prompt_output
echo -nE - $sp echo -nE - $sp

Write Preview
Loading…
Cancel
Save