Merge branch 'master' into dev

This commit is contained in:
romkatv 2019-07-17 23:25:08 +02:00
commit 394dffa77b

View file

@ -1899,21 +1899,21 @@ set_default POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME false
# behavior where they contain the end times of their preceding commands. # behavior where they contain the end times of their preceding commands.
set_default POWERLEVEL9K_TIME_UPDATE_ON_COMMAND false set_default POWERLEVEL9K_TIME_UPDATE_ON_COMMAND false
prompt_time() { prompt_time() {
if (( ! $+_P9K_TIME_TEXT )); then
if [[ $POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME == true ]]; then if [[ $POWERLEVEL9K_EXPERIMENTAL_TIME_REALTIME == true ]]; then
_p9k_escape $POWERLEVEL9K_TIME_FORMAT "$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "TIME_ICON" 0 '' \
_P9K_TIME_TEXT=("" "$_P9K_RETVAL") "$POWERLEVEL9K_TIME_FORMAT"
else else
_p9k_escape $POWERLEVEL9K_TIME_FORMAT local t=${${(%)POWERLEVEL9K_TIME_FORMAT}//\%/%%}
if [[ $POWERLEVEL9K_TIME_UPDATE_ON_COMMAND == true ]]; then if [[ $POWERLEVEL9K_TIME_UPDATE_ON_COMMAND == true ]]; then
_P9K_TIME_TEXT=("\${_P9K_LINE_FINISH-$_P9K_RETVAL}" "\${_P9K_LINE_FINISH+$_P9K_RETVAL}") _p9k_escape $t
else t=$_P9K_RETVAL
_P9K_TIME_TEXT=("$_P9K_RETVAL" "") _p9k_escape $POWERLEVEL9K_TIME_FORMAT
fi
fi
fi
"$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "TIME_ICON" 1 '' \ "$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "TIME_ICON" 1 '' \
"${(%)_P9K_TIME_TEXT[1]//\%/%%}${_P9K_TIME_TEXT[2]}" "\${_P9K_LINE_FINISH-$t}\${_P9K_LINE_FINISH+$_P9K_RETVAL}"
else
"$1_prompt_segment" "$0" "$2" "$DEFAULT_COLOR_INVERTED" "$DEFAULT_COLOR" "TIME_ICON" 0 '' $t
fi
fi
} }
################################################################ ################################################################