dot/emacs: Various Emacs-server hacks.

  * Start up server on Emacs 23 regardless of whether there's a window
    system.

  * Start up the Emacs server as well, because it's actually pretty
    good.  And it's better on Emacs 23.

  * Protect the individual server-start operations with `trap's so that
    either can fail without preventing the other one from starting.

diff --git a/dot/emacs b/dot/emacs
index 51b0470..2959e75 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,9 +86,11 @@
 
 ;; 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))
+     (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 gnuserv-frame t)
+           (trap (server-start))
+           (trap (gnuserv-start))))
 
 ;; Control backup behaviour.