X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/032e314f141c64a252c363b6dce68ed44d8e6dd9..116259a9cc62b355034279896076d2383b5f27ad:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index ae0889d..6fe3a05 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -89,8 +89,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.