# 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 --tty"
+
+ if [[ "$TERM" == screen* ]]; then
+ export EDITORBG="$EDITOR"
+ else
+ export EDITORBG="emacsclient --create-frame --no-wait"
+ fi
+else
+ export EDITOR="vim"
+ export EDITORBG="vim"
+fi
+
# Expand any symbolic links in the TMPDIR environment variable
[ -n "$TMPDIR" ] && export TMPDIR="$(cd "${TMPDIR}" && pwd -P)"