Merge remote branch 'crybaby'

* crybaby:
  dot/emacs: Mark the `edit-server' process as expendable.

diff --git a/dot/emacs b/dot/emacs
index f65a0329df709f57a1870dfa45616c8e65a0765f..65f558f1ea7f09a31154697ae9b360d2f1156308 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -99,7 +99,10 @@
            (trap (server-start))
            (trap (progn
                    (require 'edit-server)
-                   (edit-server-start)))))
+                   (edit-server-start)
+                   (let ((edit (get-process "edit-server")))
+                     (and edit
+                          (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.