Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'

[profile] / bin / mdw-editor

diff --git a/bin/mdw-editor b/bin/mdw-editor
index 96387e8..c162da3 100755 (executable)
--- a/bin/mdw-editor
+++ b/bin/mdw-editor
@@ -2,11 +2,17 @@
 
 set -e
 editor=${MDW_EDITOR-ed}
+case ${TMP+t},${TMPDIR+t} in
+  t,) TMPDIR=$TMP; export TMPDIR ;;
+esac
 emacsclient=$(
   emacsclient --eval '(>= emacs-major-version 23)' 2>/dev/null || :)
 [ -t 0 -a -t 1 ] || TERM=dumb
 case "$EDITOR,$VISUAL,$TERM" in
-  mdw-editor,mdw-editor,dumb) editor=emacsclient emacsclient=nil;;
+  mdw-editor,mdw-editor,dumb | \
+    mdw-editor,mdw-editor,emacs | \
+    mdw-editor,mdw-editor,eterm*)
+    editor=emacsclient emacsclient=nil;;
   mdw-editor,mdw-editor,*);;
   mdw-editor,*,*) editor=$VISUAL;;
   *,*,*) editor=$EDITOR;;