From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 17 Feb 2010 15:29:55 +0000 (+0000)
Subject: dot/emacs: Support the Chrome edit server.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/116259a9cc62b355034279896076d2383b5f27ad

dot/emacs: Support the Chrome edit server.
---

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.