]> code.delx.au - dotfiles/blobdiff - .bash/environment
fontconfig: -apple-system font
[dotfiles] / .bash / environment
index 0146c1309171c65dbfd5cf15a73e0651905159ae..e14b4e9721a872e3f9d32dd62ce2dac037257d51 100644 (file)
@@ -13,17 +13,22 @@ fi
 
 # General environment settings
 export PAGER="less"
-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"
+    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