X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b0ef6a6629b8f51972a8a1ca7401144e52299235..558fc01413d875fc8098108b3f8264b72d0b5f0d:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index f70c338..ed2d4d1 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -94,8 +94,12 @@
 
 (and (or window-system (>= emacs-major-version 23))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+		  edit-server-new-frame nil
 		  gnuserv-frame t)
-	    (trap (server-start))))
+	    (trap (server-start))
+	    (trap (progn
+		    (require 'edit-server)
+		    (edit-server-start)))))
 
 ;; Control backup behaviour.