diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2015-09-03 22:12:36 +0300 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2015-09-03 22:12:36 +0300 |
| commit | a6f7d573ed936b73d8804dfef48c15a658c16dcf (patch) | |
| tree | d0b09106b5af6d65524e6288914b125e9fe60be0 /powerlevel9k.zsh-theme | |
| parent | 797a953e121e4f89e9b5f80349dabb51b3e5cd89 (diff) | |
| parent | 60d92135cc4de88c0acaf56f026f07f94ad2811f (diff) | |
Merge branch 'master' into next
Resolved conflicts from 2eea3ae and 1a1cb8f.
Diffstat (limited to 'powerlevel9k.zsh-theme')
| -rw-r--r-- | powerlevel9k.zsh-theme | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index 3b89b1df..2390438e 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -267,8 +267,8 @@ zstyle ':vcs_info:*' enable git hg zstyle ':vcs_info:*' check-for-changes true VCS_DEFAULT_FORMAT="$VCS_CHANGESET_PREFIX%F{$POWERLEVEL9K_VCS_FOREGROUND}%b%c%u%m%f" -zstyle ':vcs_info:git:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_GIT_ICON')%f$VCS_DEFAULT_FORMAT" -zstyle ':vcs_info:hg:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_HG_ICON')%f$VCS_DEFAULT_FORMAT" +zstyle ':vcs_info:git*:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_GIT_ICON')%f$VCS_DEFAULT_FORMAT" +zstyle ':vcs_info:hg*:*' formats "%F{$POWERLEVEL9K_VCS_FOREGROUND}$(print_icon 'VCS_HG_ICON')%f$VCS_DEFAULT_FORMAT" zstyle ':vcs_info:*' actionformats " %b %F{red}| %a%f" @@ -669,6 +669,8 @@ prompt_virtualenv() { # Main prompt build_left_prompt() { + RETVAL=$? + defined POWERLEVEL9K_LEFT_PROMPT_ELEMENTS || POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir rbenv vcs) for element in $POWERLEVEL9K_LEFT_PROMPT_ELEMENTS; do |