From 53b213c10acc6ec56f92e61478f4013f1e2e8b3a Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Tue, 26 Jul 2016 22:23:55 -0500
Subject: [PATCH] Configuration changes

* Made emacsclient the default editor with a fallback on vim
* Made emacs follow symlinks to VC controlled files by default
* Configured emacs to copy to/from the X11 clipboard
---
 home/.emacs.d/init.el | 6 ++++++
 home/.zshrc           | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el
index dad45d2..eee4a9a 100644
--- a/home/.emacs.d/init.el
+++ b/home/.emacs.d/init.el
@@ -75,6 +75,12 @@
 ;; Disable emacs help screen
 (setq inhibit-splash-screen t)
 
+;; Emable emacs copying from X11
+(setq x-select-enable-clipboard t)
+
+;; Always follow symbolic links back to the source file in version control
+(setq x-select-enable-clipboard t)
+
 ;; Markdown Mode Configuration
 (autoload 'markdown-mode "markdown-mode"
    "Major mode for editing Markdown files" t)
diff --git a/home/.zshrc b/home/.zshrc
index 22b74f9..929c0bd 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -21,8 +21,8 @@ source $ZSH/oh-my-zsh.sh
 # Make sure we're in en_us UTF8
 export LANG=en_US.UTF-8
 
-# All Hail VIM
-export EDITOR='vim'
+# All Hail EMACS
+export EDITOR='emacsclient -a vim'
 
 # Make sure ~/bin is on the path
 export PATH="$HOME/bin:$PATH"
@@ -40,7 +40,8 @@ function append_if_exists() {
 }
 
 # Alias to emacsclient
-alias ec="emacsclient"
+# fall back on vim if emacs isn't started
+alias ec="emacsclient -a vim"
 
 # Don't use the embedded shell time. Use GNU time.
 alias time="/usr/bin/time"