emacs: switch from vim, simplify vim config a little

[dotfiles] / .bash / environment

diff --git a/.bash/environment b/.bash/environment
index 647f6a6a4c0377b64848c5a4c68ce8b724acc3f4..0146c1309171c65dbfd5cf15a73e0651905159ae 100644 (file)
--- a/.bash/environment
+++ b/.bash/environment
@@ -13,12 +13,19 @@ fi
 
 # General environment settings
 export PAGER="less"
-export EDITOR="vim"
 export CVS_RSH="ssh"
 export RSYNC_RSH="ssh"
 export PYTHONSTARTUP="${HOME}/.pythonrc.py"
 export EMAIL="James Bunton <jamesbunton@delx.net.au>"
 
+# Editor settings
+if emacsclient --version &> /dev/null; then
+    export ALTERNATE_EDITOR="vim"
+    export EDITOR="emacsclient --create-frame"
+else
+    export EDITOR="vim"
+fi
+
 # Expand any symbolic links in the TMPDIR environment variable
 [ -n "$TMPDIR" ] && export TMPDIR="$(cd "${TMPDIR}" && pwd -P)"