Merge branch 'master' into android2

This commit is contained in:
Dylan Araps 2016-10-22 09:52:26 +11:00
commit 8bc6b2d183

View file

@ -2953,7 +2953,7 @@ dynamicprompt() {
fi fi
# Set the prompt location # Set the prompt location
[ "$image" != "off" ] && printf "\033[${lines/-*/0}B" printf "\033[${lines/-*/0}B"
# Add some padding # Add some padding
[ "$image" == "ascii" ] && \ [ "$image" == "ascii" ] && \