diff options
| author | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
|---|---|---|
| committer | Tristan Carel <tcarel@exalead.com> | 2011-10-10 14:58:28 +0200 |
| commit | db90589c8a02e98e657af17bb0b460b752d9ed61 (patch) | |
| tree | d1354a9338bf9921ad0f66d2f5394272e1cfec77 /themes/fishy.zsh-theme | |
| parent | 7066bf7c6b522af9147ebf03c00361c4c6490d42 (diff) | |
| parent | 57f04b921ea1c12a0a283331778848cd4011bf21 (diff) | |
| download | zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.gz zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.tar.bz2 zsh-db90589c8a02e98e657af17bb0b460b752d9ed61.zip | |
Merge remote-tracking branch 'upstream/master' into emacs
Conflicts:
plugins/emacs/emacs.plugin.zsh
plugins/emacs/emacsclient.sh
Diffstat (limited to 'themes/fishy.zsh-theme')
| -rw-r--r-- | themes/fishy.zsh-theme | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme index f22eda868..f9e506cae 100644 --- a/themes/fishy.zsh-theme +++ b/themes/fishy.zsh-theme @@ -3,7 +3,18 @@ local user_color='green'; [ $UID -eq 0 ] && user_color='red' PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) ' PROMPT2='%{$fg[red]%}\ %{$reset_color%}' -RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)' -ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" +local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" +RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}' + +ZSH_THEME_GIT_PROMPT_PREFIX=" " +ZSH_THEME_GIT_PROMPT_SUFFIX="" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" + +ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+" +ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!" +ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-" +ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>" +ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?" |