From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 12 Jun 2006 18:00:38 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/af145726693c5c4ef42f10bbce3be259363436cc?hp=f6335a0c00d36b3a17c1c4dab596f9cbab69491f

Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
---

diff --git a/emacs b/emacs
index 3bbf979..67dc57b 100644
--- 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)