Merge remote branch 'crybaby'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f70c338fd58db3e6b561213272b74c8ecdcad9d8..ed2d4d1cd7034aba1bd8161f2d03fe255a7d9d86 100644 (file)
--- 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.