From bb68b52996723cb1bc6cdb4d96b9cfeec690d471 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 14 Nov 2014 01:42:30 -0800
Subject: [PATCH] Fix tramp mode/zshrc issues.

---
 dotfiles/bashrc          | 6 +++---
 dotfiles/emacs.d         | 2 +-
 dotfiles/lib/shellenv.sh | 3 ++-
 dotfiles/zshrc           | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index b287fb90..35822231 100644
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -1,5 +1,5 @@
-source ~/.lib/shellenv.sh
+# This is necessary for tramp.
+[ $TERM == "dumb" ] &&  PS1='$ ' && return
+source ~/.lib/shellenv.sh # Emulate zshs env/rc distinction
 source ~/.lib/shellrc.sh
 source ~/.lib/bash.sh
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 999de1d6..c37bdc16 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 999de1d605c0238c14fd488a735dd488c3205974
+Subproject commit c37bdc16aadb9aaffbdae1137010775a04925eaa
diff --git a/dotfiles/lib/shellenv.sh b/dotfiles/lib/shellenv.sh
index 5846f33b..82a9e10c 100644
--- a/dotfiles/lib/shellenv.sh
+++ b/dotfiles/lib/shellenv.sh
@@ -30,4 +30,5 @@ add_to_front_of_path "$JAVA_HOME/bin"
 add_to_back_of_path "$(dotfiles_directory)/resources/python"
 add_to_back_of_path "/usr/local/sbin"
 
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
+# Load RVM into a shell session *as a function*
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 9cca5b27..2a693b01 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,5 +1,5 @@
+# This is necessary for tramp.
+[[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return
 source ~/.lib/shellrc.sh
 source ~/.lib/zsh.sh
 test -r ~/custom.zsh && source ~/custom.zsh
-
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting