emacs: Use w3m as default browser, but fall back to others.

Also tweak the w3m settings a bit, to get images rendered and suchlike.

diff --git a/emacs b/emacs
index 9c10d0a2aef0ab6789f17fca3d082afa102b33ca..b1168d67c05f5230834a233a815989989bacaf7b 100644 (file)
--- a/emacs
+++ b/emacs
@@ -146,8 +146,6 @@
 (setq Info-fontify-maximum-menu-size 60000)
 (setq ispell-dictionary "british"
       flyspell-default-dictionary "british")
-(setq browse-url-browser-function 'browse-url-mozilla
-      browse-url-mozilla-program "firefox")
 (trap
   (require 'uniquify)
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
@@ -171,6 +169,18 @@
          ("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 w3m-default-display-inline-images t)
+
 (setq w3-do-incremental-display t
       w3-use-menus '(file edit view go bookmark options
                     buffers style search emacs nil help)