Merge pull request #496 from belak/options-oddities

Fix some oddities with prompt options
This commit is contained in:
Ben Hilburn 2017-04-20 11:49:24 -04:00 committed by GitHub
commit 2f462bd33a

View file

@ -1336,6 +1336,16 @@ prompt_powerlevel9k_setup() {
# Maximum integer on 32-bit CPUs
_P9K_TIMER_START=2147483647
# The prompt function will set these prompt_* options after the setup function
# returns. We need prompt_subst so we can safely run commands in the prompt
# without them being double expanded and we need prompt_percent to expand the
# common percent escape sequences.
prompt_opts=(subst percent)
# Borrowed from promptinit, sets the prompt options in case the theme was
# not initialized via promptinit.
setopt noprompt{bang,cr,percent,subst} "prompt${^prompt_opts[@]}"
# Display a warning if the terminal does not support 256 colors
local term_colors
term_colors=$(echotc Co 2>/dev/null)
@ -1367,12 +1377,6 @@ prompt_powerlevel9k_setup() {
)
print_deprecation_warning deprecated_segments
setopt prompt_subst
setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS
setopt PROMPT_CR PROMPT_PERCENT PROMPT_SUBST MULTIBYTE
# initialize colors
autoload -U colors && colors