From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 9 Nov 2009 15:03:13 +0000 (+0000)
Subject: dot/emacs: Always start the servers in Emacs 23.
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/7cd3318bec2f596106ad48f9b5b191b37148aea1

dot/emacs: Always start the servers in Emacs 23.

We can always open frames and terminal sessions, so it makes sense to
just have the one Emacs.
---

diff --git a/dot/emacs b/dot/emacs
index d79aeeb..845f1ff 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,9 +86,10 @@
 
 ;; Emacs server behaviour.
 
-(and window-system
-     (trap (gnuserv-start)
-	   (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))))
+(and (or window-system (>= emacs-major-version 23))
+     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
+	   (start-server)
+	   (gnuserv-start)))
 
 ;; Control backup behaviour.