X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/7a24847d3157b33643cd154019731e24294f27f1..9bbb1ba06bc0296f78e4817fe58e0b838c765414:/bin/mdw-editor

diff --git a/bin/mdw-editor b/bin/mdw-editor
index 2c7535b..c162da3 100755
--- a/bin/mdw-editor
+++ b/bin/mdw-editor
@@ -2,7 +2,11 @@
 
 set -e
 editor=${MDW_EDITOR-ed}
-emacsclient=t
+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 | \
@@ -15,5 +19,5 @@ case "$EDITOR,$VISUAL,$TERM" in
 esac
 case "$emacsclient" in
   t) exec emacsclient -nw -a "$editor" "$@";;
-  nil) exec $editor "$@";;
+  *) exec $editor "$@";;
 esac