From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 31 Mar 2010 09:13:14 +0000 (+0100)
Subject: Merge remote branch 'crybaby'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/bf9701975604ddb0125d53d4119787341493224b?ds=inline;hp=-c

Merge remote branch 'crybaby'

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

bf9701975604ddb0125d53d4119787341493224b
diff --combined dot/emacs
index f65a032,ea038b8..65f558f
--- a/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)