diff options
| author | fred-o <fredrik.appelberg@gmail.com> | 2012-02-20 09:41:45 +0100 |
|---|---|---|
| committer | fred-o <fredrik.appelberg@gmail.com> | 2012-02-20 09:41:45 +0100 |
| commit | 7e5dda7f434b847e4a8899beb736a7251da3d390 (patch) | |
| tree | 45eccafa617e7e3ec4e7e97ff7569b157786dd6c /themes/jonathan.zsh-theme | |
| parent | f5041025844a2509f42e0bb19cb8d5418340e10c (diff) | |
| parent | 362927003bcd8052e294dcbdf14f061ef4f2e173 (diff) | |
| download | zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.gz zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.tar.bz2 zsh-7e5dda7f434b847e4a8899beb736a7251da3d390.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-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\ |