From 1451d039c2b759e6283dc2fd93e584aa1d9660f6 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Wed, 19 Nov 2014 23:23:11 -0800
Subject: [PATCH] Fix e

---
 dotfiles/lib/shellrc/emacs.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dotfiles/lib/shellrc/emacs.sh b/dotfiles/lib/shellrc/emacs.sh
index 839810d0..5a5c5048 100644
--- a/dotfiles/lib/shellrc/emacs.sh
+++ b/dotfiles/lib/shellrc/emacs.sh
@@ -1,11 +1,10 @@
 alias emacs='_emacs -c -n '
 is_osx && alias emacs='cocoa_emacs'
 alias terminal_emacs='_emacs -t'
-export GLOBAL_EMACS=""
 is_ssh && emacs="terminal_emacs"
 
 function e {
-    [ ! -z "$*" ] && emacs || emacs_open -n "$@"
+    [ -z "$*" ] && emacs || emacs_open -n "$@"
 }
 
 function cocoa_emacs {
@@ -22,8 +21,8 @@ function _emacs {
 }
 
 function _emacs_server_file {
-    local server_name="$GLOBAL_EMACS"
-    [ -z $GLOBAL_EMACS ] && server_name="$(_current_dot_directory)"
+    local server_name="global"
+    [ ! -z ${PER_DIRECTORY_EMACS+y} ] && server_name="$(_current_dot_directory)"
     echo $server_name
 }