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;;
+ 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;;
;; Emacs server behaviour.
(and (or window-system (>= emacs-major-version 23))
- (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
- (server-start)
- (gnuserv-start)))
+ (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+ gnuserv-frame t)
- (trap (server-start))
- (trap (gnuserv-start))))
++ (trap (server-start))))
;; Control backup behaviour.