From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 21 Nov 2009 11:46:18 +0000 (+0000)
Subject: bin/mdw-editor: Find out about the Emacs server version.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/7e50381192d916a5034b87956725b5b86a9c58a2?hp=--cc

bin/mdw-editor: Find out about the Emacs server version.

Emacs 22's client doesn't like the `-nw' option, unsurprisingly.  So
interrogate it first to find out what's going on.

I suppose this also means that there's not a great deal of point in
using the `-a' option, but it doesn't do a great deal of harm.
---

7e50381192d916a5034b87956725b5b86a9c58a2
diff --git a/bin/mdw-editor b/bin/mdw-editor
index 312995f..96387e8 100755
--- a/bin/mdw-editor
+++ b/bin/mdw-editor
@@ -2,7 +2,8 @@
 
 set -e
 editor=${MDW_EDITOR-ed}
-emacsclient=t
+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;;
@@ -12,5 +13,5 @@ case "$EDITOR,$VISUAL,$TERM" in
 esac
 case "$emacsclient" in
   t) exec emacsclient -nw -a "$editor" "$@";;
-  nil) exec $editor "$@";;
+  *) exec $editor "$@";;
 esac