Merge remote branch 'crybaby'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index ea038b8a4374da4c456986b879ac7e07ec172622..65f558f1ea7f09a31154697ae9b360d2f1156308 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -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)