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 d79aeeb16907e827c4b83d79fed59c721c02ef3b..845f1ff572c4e990873fae55502322528bb00a2e 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,9 +86,10 @@
 
 ;; Emacs server behaviour.
 
 
 ;; 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.
 
 
 ;; Control backup behaviour.