diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2012-04-12 19:28:59 +0200 |
| commit | 741388be00fb88b7680e0faa328adf5a86e1f65f (patch) | |
| tree | 5e53a65fcc71bc01c5f81b28fb5e54faaf3ab2a8 /themes/jonathan.zsh-theme | |
| parent | 37266112759a5759536cc4ea84ea063695cd1f2e (diff) | |
| parent | 1120f973054836eeb53750f57d69fbec41a340dc (diff) | |
| download | zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.gz zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.bz2 zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.zip | |
Merge remote branch 'upstream/master'
Conflicts:
lib/completion.zsh
Diffstat (limited to 'themes/jonathan.zsh-theme')
| -rw-r--r-- | themes/jonathan.zsh-theme | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme index a170a13d0..2f0c4b917 100644 --- a/themes/jonathan.zsh-theme +++ b/themes/jonathan.zsh-theme @@ -10,7 +10,7 @@ function theme_precmd { PR_PWDLEN="" local promptsize=${#${(%):---(%n@%m:%l)---()--}} - local rubyprompt=`rvm_prompt_info` + local rubyprompt=`rvm_prompt_info || rbenv_prompt_info` local rubypromptsize=${#${rubyprompt}} local pwdsize=${#${(%):-%~}} @@ -113,7 +113,7 @@ setprompt () { PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\ $PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\ $PR_GREEN%$PR_PWDLEN<...<%~%<<\ -$PR_GREY)`rvm_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\ +$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\ $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\ $PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\ |