gitconfig: added expire-prune

[dotfiles] / .bash / environment

diff --git a/.bash/environment b/.bash/environment
index 924a595d0014960ba0c7c4d6d020777ea1fa58fd..e14b4e9721a872e3f9d32dd62ce2dac037257d51 100644 (file)
--- a/.bash/environment
+++ b/.bash/environment
@@ -19,12 +19,12 @@ 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"
-    export EDITORBG="emacsclient --create-frame --no-wait"
+    export EDITOR="emacsclient --tty"
 
-    # Disable emacs inside screen
     if [[ "$TERM" == screen* ]]; then
-        export EMACS_SERVER_FILE=
+        export EDITORBG="$EDITOR"
+    else
+        export EDITORBG="emacsclient --create-frame --no-wait"
     fi
 else
     export EDITOR="vim"