From ce0fe10bdcc4521e6c038796d5b93a5d5e57e54c Mon Sep 17 00:00:00 2001
From: tinogomes <tinorj@gmail.com>
Date: Thu, 12 May 2011 08:19:45 -0300
Subject: [PATCH 1/2] Bugfix: prompt display the current directory as
 "~rvm_rvmrc_cwd"

---
 lib/rvm.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index 597be1b33..5c354cd88 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -4,4 +4,10 @@ function rvm_prompt_info() {
   echo "($ruby_version)"
 }
 
+if [[ -s $HOME/.rvm/scripts/rvm ]]; then
+    # Bugfix: prompt displays the current directory as "~rvm_rvmrc_cwd"
+    # http://beginrescueend.com/integration/zsh/
+    unsetopt auto_name_dirs
 
+    source $HOME/.rvm/scripts/rvm
+fi

From febb3206566ef3c1140b464e42c73c9b1d46dd11 Mon Sep 17 00:00:00 2001
From: tinogomes <tinorj@gmail.com>
Date: Thu, 12 May 2011 08:21:14 -0300
Subject: [PATCH 2/2] Reload the .rvmrc on current directory after open new
 tabs/windows and "Reuse Previuos Tab Directory"

---
 templates/zshrc.zsh-template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 576d45eaa..b4df284cb 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -25,4 +25,9 @@ plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
+# After open new tabs / windows and "Reuse Previous Tab's Directory"
+# reload the .rvmrc file on current directory
+# http://beginrescueend.com/integration/zsh/
+[[ -s $HOME/.rvm/scripts/rvm ]] && __rvm_project_rvmrc
+
 # Customize to your needs...