xmonad: change restart key

[dotfiles] / .bash / environment

diff --git a/.bash/environment b/.bash/environment
index 2956ea31ad28d2c9e16d93404680435f82ecf28a..e14b4e9721a872e3f9d32dd62ce2dac037257d51 100644 (file)
--- a/.bash/environment
+++ b/.bash/environment
@@ -19,9 +19,16 @@ 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 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