Merge branch 'master' into reactive

pull/436/head
romkatv 5 years ago
commit 9f83e5e1dc

@ -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,7 +4274,12 @@ 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\\')}
if [[ -n $unexpected ]]; then
local omz1='[Oh My Zsh] Would you like to update? [Y/n]: '
local omz2='Updating Oh My Zsh'
local omz3='https://shop.planetargon.com/collections/oh-my-zsh'
if [[ -n ${${unexpected/$omz1}/$omz2*$omz3($'\n'|)} ]]; then
echo -E - "" echo -E - ""
echo -E - "${(%):-[%3FWARNING%f]: Console output during zsh initialization detected.}" echo -E - "${(%):-[%3FWARNING%f]: Console output during zsh initialization detected.}"
echo -E - "" echo -E - ""
@ -4315,6 +4321,7 @@ function _p9k_clear_instant_prompt() {
echo - "${(%):-%3F-- console output produced during zsh initialization follows --%f}" echo - "${(%):-%3F-- console output produced during zsh initialization follows --%f}"
echo -E - "" echo -E - ""
fi fi
fi
cat $__p9k_instant_prompt_output cat $__p9k_instant_prompt_output
echo -nE - $sp echo -nE - $sp
zf_rm -f -- $__p9k_instant_prompt_output zf_rm -f -- $__p9k_instant_prompt_output

Loading…
Cancel
Save