Merge remote branch 'crybaby'

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

diff --combined dot/emacs
index f65a0329df709f57a1870dfa45616c8e65a0765f,ea038b8a4374da4c456986b879ac7e07ec172622..65f558f1ea7f09a31154697ae9b360d2f1156308
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -99,7 -99,10 +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.
  
@@@ -272,7 -275,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)