bashrc: Remove references to `sensible-editor'.

[profile] / emacs

diff --git a/emacs b/emacs
index a9164a2..2b74aef 100644 (file)
--- 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)
@@ -453,8 +468,9 @@
 (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t)
 (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t)
 (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t)
-(require 'slime)
-(slime-setup :autodoc t)
+(trap
+  (require 'slime)
+  (slime-setup :autodoc t))
 (trap (require 'xscheme))
 (setq-default xscheme-process-command-line "scheme -large -emacs")
 (add-hook 'inferior-lisp-mode-hook
@@ -483,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" . "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 --------------------------------------------------