diff options
| author | Ben Hilburn <bhilburn@gmail.com> | 2018-01-31 00:44:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 00:44:27 +0300 |
| commit | fd3d2343547b07d74cb102dd843f8a54d9e0b79f (patch) | |
| tree | 28cee1fde54fb0871f06822501ad55122298e765 | |
| parent | 8090d13962dd3f8b3341f39314503477ce582bf9 (diff) | |
| parent | f994a7c3491487252070590b4e05ddaa17ef48f1 (diff) | |
Merge pull request #681 from Stazer/tcolor-warning
Added flag to ignore checking the term colors & lang settings
| -rw-r--r-- | functions/colors.zsh | 4 | ||||
| -rwxr-xr-x | powerlevel9k.zsh-theme | 18 |
2 files changed, 15 insertions, 7 deletions
diff --git a/functions/colors.zsh b/functions/colors.zsh index 7a748ab3..f421165c 100644 --- a/functions/colors.zsh +++ b/functions/colors.zsh @@ -7,6 +7,10 @@ ################################################################ function termColors() { + if [[ $POWERLEVEL9K_IGNORE_TERM_COLORS == true ]]; then + return + fi + local term_colors if which tput &>/dev/null; then diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 3edc5cca..c32ccd48 100755 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -1625,6 +1625,8 @@ NEWLINE=' [[ $POWERLEVEL9K_PROMPT_ADD_NEWLINE == true ]] && PROMPT="$NEWLINE$PROMPT" } +set_default POWERLEVEL9K_IGNORE_TERM_COLORS false +set_default POWERLEVEL9K_IGNORE_TERM_LANG false prompt_powerlevel9k_setup() { # The value below was set to better support 32-bit CPUs. # It's the maximum _signed_ integer value on 32-bit CPUs. @@ -1647,13 +1649,15 @@ prompt_powerlevel9k_setup() { termColors # If the terminal `LANG` is set to `C`, this theme will not work at all. - local term_lang - term_lang=$(echo $LANG) - if [[ $term_lang == 'C' ]]; then - print -P "\t%F{red}WARNING!%f Your terminal's 'LANG' is set to 'C', which breaks this theme!" - print -P "\t%F{red}WARNING!%f Please set your 'LANG' to a UTF-8 language, like 'en_US.UTF-8'" - print -P "\t%F{red}WARNING!%f _before_ loading this theme in your \~\.zshrc. Putting" - print -P "\t%F{red}WARNING!%f %F{blue}export LANG=\"en_US.UTF-8\"%f at the top of your \~\/.zshrc is sufficient." + if [[ $POWERLEVEL9K_IGNORE_TERM_LANG == false ]]; then + local term_lang + term_lang=$(echo $LANG) + if [[ $term_lang == 'C' ]]; then + print -P "\t%F{red}WARNING!%f Your terminal's 'LANG' is set to 'C', which breaks this theme!" + print -P "\t%F{red}WARNING!%f Please set your 'LANG' to a UTF-8 language, like 'en_US.UTF-8'" + print -P "\t%F{red}WARNING!%f _before_ loading this theme in your \~\.zshrc. Putting" + print -P "\t%F{red}WARNING!%f %F{blue}export LANG=\"en_US.UTF-8\"%f at the top of your \~\/.zshrc is sufficient." + fi fi defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs) |