X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/9a3fa88e036c5cf72051a9f289d3b4f28f38c5f6..9b72460cefa01e43c6a5891704a9498fdda8ea16:/emacs

diff --git a/emacs b/emacs
index 28b3334..b1168d6 100644
--- a/emacs
+++ b/emacs
@@ -34,10 +34,16 @@
 
 (setq load-path (cons "~/lib/emacs" load-path))
 
-(autoload 'cc-mode "cc-mode" nil t)
-(autoload 'rexx-mode "rexx-mode" nil t)
-(autoload 'cvs-update "pcl-cvs" nil t)
-(autoload 'debian-changelog-mode "debian-changelog-mode" nil t)
+(maybe-autoload 'cc-mode "cc-mode" nil t)
+(maybe-autoload 'rexx-mode "rexx-mode" nil t)
+(maybe-autoload 'cvs-update "pcl-cvs" nil t)
+(maybe-autoload 'debian-changelog-mode "debian-changelog-mode" nil t)
+(maybe-autoload 'git-status "git" nil t)
+(and (library-exists-p "vc-git")
+     (not (memq 'GIT vc-handled-backends))
+     (setq vc-handled-backends (append vc-handled-backends (list 'GIT))))
+(and (library-exists-p "quilt")
+     (load "quilt"))
 
 (trap
   (or (fboundp 'make-regexp)
@@ -140,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)
@@ -165,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)
@@ -319,6 +335,7 @@
 			  "svk-commit[^/.]*\\.tmp" "\\|"
 			  "gitci\\.[^/.]*" "\\|"
 			  "cvs[^/.]\\{6\\}" "\\|"
+			  "quilt_header\.[^/.]\\{6\\}"
 			  "\\)$")
 		 . text-mode)
 		("\\.calc?$" . apcalc-mode)