X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/af145726693c5c4ef42f10bbce3be259363436cc..370d4c8dc38812c0ac323b1eb88b8997b4c12b51:/emacs

diff --git a/emacs b/emacs
index 67dc57b..194bb28 100644
--- a/emacs
+++ b/emacs
@@ -162,22 +162,15 @@
 
 ;;;----- W3 and URL fetching stuff ------------------------------------------
 
-(let ((proxy (mdw-config 'proxy)))
+(let ((proxy (mdw-config 'http-proxy)))
   (setq url-proxy-services
 	`(("http" . ,proxy)
 	  ("ftp" . ,proxy)
 	  ("gopher" . ,proxy))))
 (setq url-cookie-untrusted-urls '("."))
-
-(let ((browsers '(w3m browse-url-w3 browse-url-mozilla)) browser)
-  (while browsers
-    (setq browser (car browsers)
-	  browsers (cdr browsers))
-    (if (fboundp browser)
-	(setq browse-url-browser-function browser
-	      browsers nil))))
 	  
-(setq browse-url-mozilla-program "firefox")
+(setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-mozilla-program "firefox")
 
 (setq w3m-default-display-inline-images t)