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

diff --combined emacs
index 3bbf9796d99a1ace3e72f77a8eef2dbafe81202e,b1168d67c05f5230834a233a815989989bacaf7b..67dc57b3a41a438cb78c31ece26c079295f4e538
--- 1/emacs
--- 2/emacs
+++ b/emacs
@@@ -146,8 -146,6 +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 +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)
@@@ -342,10 -352,6 +352,10 @@@
                 . mdwmail-mode))
              auto-mode-alist))
  
 +(setq interpreter-mode-alist
 +      (append `(("runlisp" . lisp-mode))
 +            interpreter-mode-alist))
 +
  (setq completion-ignored-extensions
        (append `(".hc" ".hi") completion-ignored-extensions))