From 3352c38e7dec79484ba508d6d0b80101fc9bc7f5 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 17 Nov 2015 23:52:37 -0800
Subject: [PATCH] Always use normal emacsclient instead of specific serverfile

---
 dotfiles/lib/shellenv/emacs.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dotfiles/lib/shellenv/emacs.sh b/dotfiles/lib/shellenv/emacs.sh
index 5ab72da3..7a16a829 100644
--- a/dotfiles/lib/shellenv/emacs.sh
+++ b/dotfiles/lib/shellenv/emacs.sh
@@ -112,10 +112,11 @@ function time_emacs {
 }
 
 function emacs_editor {
+    local client_path="$(which emacsclient)"
 	if is_osx; then
-		reattach-to-user-namespace emacsclient --server-file=server "$@"
+		reattach-to-user-namespace "$client_path" "$@"
 	else
-		emacsclient "$@"
+		"$client_path" "$@"
 	fi
 }