Updates ZSH_THEME and trims fat from config

1 files changed, 14 insertions, 2 deletions

diff --git a/emacs/index.sh b/emacs/index.sh
index e794c24ae942..d80372eba312 100755
--- a/emacs/index.sh
+++ b/emacs/index.sh
@@ -1,6 +1,15 @@
 #!/usr/bin/env zsh
 
 
+# Have zsh export variables for Emacs to track the cwd
+if [ -n "$INSIDE_EMACS" ]; then
+  chpwd() { print -P "\033AnSiTc %d" }
+  print -P "\033AnSiTu %n"
+  print -P "\033AnSiTc %d"
+fi
+
+
+# Custom emacs pager support
 if [ -n "$INSIDE_EMACS" ]; then
     export PAGER="create-shell-pager.sh"
 else
@@ -8,22 +17,25 @@ else
 fi
 
 
+# Edit commit messages, etc from ansi-term in emacs
 if [ -n "$INSIDE_EMACS" ]; then
     export EDITOR="edit-file-in-emacs.sh"
 else
-    export EDITOR="command nvim"
+    export EDITOR="command vim"
 fi
 
 
+# Calls to vim from within ansi-term trigger emacs find-file
 vim () {
     if [ -n "$INSIDE_EMACS" ]; then
         emacsclient -e "(find-file-other-window \"$1\")"
     else
-        nvim "$1"
+        command vim "$1"
     fi
 }
 
 
+# Calls to man from within ansi-term trigger emacs man
 man () {
     if [ -n "$INSIDE_EMACS" ]; then
         emacsclient -e  "(man \"$1\")"