Merge branch 'master' into next

This commit is contained in:
Ben Hilburn 2017-04-18 18:08:44 -04:00
commit c70bb0d4ee
2 changed files with 2 additions and 2 deletions

View file

@ -150,7 +150,7 @@ case $POWERLEVEL9K_MODE in
SSH_ICON '(ssh)'
)
;;
'nerdfont-fontconfig')
'nerdfont-complete'|'nerdfont-fontconfig')
# nerd-font patched (complete) font required! See
# https://github.com/ryanoasis/nerd-fonts
# Set the right locale to protect special characters

View file

@ -1013,7 +1013,7 @@ prompt_status() {
"$1_prompt_segment" "$0_ERROR" "$2" "$DEFAULT_COLOR" "red" "" 'FAIL_ICON'
fi
elif [[ "$POWERLEVEL9K_STATUS_VERBOSE" == true || "$POWERLEVEL9K_STATUS_OK_IN_NON_VERBOSE" == true ]]; then
"$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "046" "" 'OK_ICON'
"$1_prompt_segment" "$0_OK" "$2" "$DEFAULT_COLOR" "green" "" 'OK_ICON'
fi
}