X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3699ffd4266ac1f00f65b2beffb3af7607741364..65ff0e8c7832d308e4a2e4953ac2df8008d48d6e:/emacs

diff --git a/emacs b/emacs
index e76ff52..28b3334 100644
--- a/emacs
+++ b/emacs
@@ -153,10 +153,23 @@
 (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 '("."))
+
+(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 ---------------------------------------------
 
@@ -313,6 +326,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 +483,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 +499,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" . "metalzone.distorted.org.uk:3128") ("ftp" . "metalzone.distorted.org.uk:3128") ("gopher" . "metalzone.distorted.org.uk: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 --------------------------------------------------