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/murilasso.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/murilasso.zsh-theme')
| -rw-r--r-- | themes/murilasso.zsh-theme | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme index 310357b45..bc2b9b224 100644 --- a/themes/murilasso.zsh-theme +++ b/themes/murilasso.zsh-theme @@ -1,7 +1,7 @@ local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}' local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}' -local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info)%{$reset_color%}' +local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}' local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}' PROMPT="${user_host}:${current_dir} ${rvm_ruby} |