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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f5d3ce0..845f1ff 100644 (file)
--- 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.
 
@@ -359,14 +360,13 @@
       (mdw-uniquify-alist
        '((width . 78)
         (height . 33)
-        (vertical-scroll-bars . right))
-       (and window-system
-           '((cursor-type . bar)
-             (cursor-blink . t)
-             (left-fringe . 5)
-             (right-fringe . 5)
-             (scroll-bar-width . 15)))
-       '((cursor-color . "red"))
+        (vertical-scroll-bars . right)
+        (cursor-type . bar)
+        (cursor-blink . t)
+        (left-fringe . 5)
+        (right-fringe . 5)
+        (scroll-bar-width . 15)
+        (cursor-color . "red"))
        (if mdw-black-background
           '((background-color . "black")
             (foreground-color . "white")