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

diff --git a/emacs b/emacs
index 965b643..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)
@@ -153,10 +157,35 @@
 (trap (global-auto-revert-mode t))
 (setq psgml-html-build-new-buffer nil)
 
-(setq cltl2-root-url
-      "http://metalzone.distorted.org.uk/doc/cltl/")
-(setq common-lisp-hyperspec-root
-      "http://metalzone.distorted.org.uk/doc/hyperspec/")
+(setq cltl2-root-url (mdw-config 'cltl-url))
+(setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
+
+;;;----- W3 and URL fetching stuff ------------------------------------------
+
+(let ((proxy (mdw-config '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 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)
+      w3-display-inline-image t
+      w3-keybinding 'info)
 
 ;;;----- Calendar configuration ---------------------------------------------
 
@@ -306,6 +335,7 @@
 			  "svk-commit[^/.]*\\.tmp" "\\|"
 			  "gitci\\.[^/.]*" "\\|"
 			  "cvs[^/.]\\{6\\}" "\\|"
+			  "quilt_header\.[^/.]\\{6\\}"
 			  "\\)$")
 		 . text-mode)
 		("\\.calc?$" . apcalc-mode)
@@ -313,6 +343,8 @@
 		("/\\(s\\|sh\\)/" . arm-assembler-mode)
 		("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
 		("\\.st$" . smalltalk-mode)
+		("\\.msgs$" . messages-mode)
+		("/all-cmds\\.in$" . cpp-messages-mode)
 		("\\.\\(tex\\|dtx\\)$" . latex-mode)
 		("\\.gc$" . haskell.-mode)
 		(,(concat "^" (getenv "HOME") "/News/") . mdwmail-mode)
@@ -468,7 +500,7 @@
 
 ;; --- Make the shell mode aware of my prompt ---
 
-(setq shell-prompt-pattern "^[^]#$%>»\n]*[]#$%>»] *")
+(setq shell-prompt-pattern "^[^]#$%>»}\n]*[]#$%>»}] *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
 	      "[Pp]assword\\|pass phrase\\):\\s *\\'"))
@@ -484,21 +516,4 @@
 (trap (select-window mdw-init-window))
 (provide 'emacs-init)
 
-;;;----- Emacs customization crud -------------------------------------------
-
-(custom-set-variables
-  ;; custom-set-variables was added by Custom -- don't edit or cut/paste it!
-  ;; Your init file should contain only one such instance.
- '(url-cookie-untrusted-urls (quote (".")))
- '(url-proxy-services (quote (("http" . "tux.nsict.org:3128") ("ftp" . "tux.nsict.org:3128") ("gopher" . "tux.nsict.org:3128"))))
- '(w3-do-incremental-display t)
- '(w3-honor-stylesheets nil)
- '(w3-use-menus (quote (file edit view go bookmark options buffers style search emacs nil help)))
- '(w3m-display-inline-image t)
- '(w3m-key-binding (quote info)))
-(custom-set-faces
-  ;; custom-set-faces was added by Custom -- don't edit or cut/paste it!
-  ;; Your init file should contain only one such instance.
- )
-
 ;;;----- That's all, folks --------------------------------------------------