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

diff --git a/dot/emacs b/dot/emacs
index f70c338..65f558f 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -94,8 +94,15 @@
 
 (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)
+		    (let ((edit (get-process "edit-server")))
+		      (and edit
+			   (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.
 
@@ -268,6 +275,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
 (setq w3m-default-display-inline-images t)