X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e6569a2f66bea072d600d88f150809412ade8033..e2bc02183b57603acd10804a0f49e081a717be8c:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 7d60a19..b840867 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,6 +86,13 @@
 (trap (show-paren-mode t))
 (or window-system (menu-bar-mode -1))
 
+;; Multiple cursors.
+
+(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/")))
+(global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap)
+(autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
+  "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
+
 ;; Temporary directory handling.
 
 (defun mdw-check-dir-exists (dir)
@@ -141,7 +148,10 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
-(setq sendmail-program "~/bin/sendmail-hack")
+(setq sendmail-program "~/bin/sendmail-hack"
+      send-mail-function 'sendmail-send-it
+      mail-interactive t
+      sendmail-error-reporting-interactive '("-odb" "-oee"))
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
@@ -149,6 +159,8 @@
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
+      message-interactive t
+      message-sendmail-extra-arguments '("-odb" "-oee")
       message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
 					 mdw-trim-spaces-after-citing))
@@ -281,6 +293,13 @@
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
+(setq rfcview-rfc-location-pattern
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc%s.txt"
+      rfcview-std-location-pattern
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/std/std%s.txt"
+      rfcview-index-location
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc-index.txt")
+
 ;;;--------------------------------------------------------------------------
 ;;; W3 and URL fetching stuff.
 
@@ -293,7 +312,7 @@
 
 (setq browse-url-browser-function (mdw-good-url-browser)
       browse-url-generic-program "mdw-chrome"
-      browse-url-mozilla-program "firefox")
+      browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
       w3m-use-cookies t)
@@ -410,7 +429,7 @@
 
 (setq default-frame-alist
       (mdw-uniquify-alist
-       '((width . 78)
+       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	 (height . 33)
 	 (vertical-scroll-bars . right)
 	 (cursor-type . bar)
@@ -418,14 +437,15 @@
 	 (left-fringe . 5)
 	 (right-fringe . 5)
 	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
+	 (cursor-color . "red")
+	 (background-mode . ,(if mdw-black-background 'dark 'light)))))
 (setq window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")
 	    (background-color . "lightgrey"))
+	(w32 (font . "fixed613 10")
+	     (background-color . "black")
+	     (foreground-color . "white"))
 	(nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
@@ -496,7 +516,7 @@
 (or mdw-fast-startup
     (trap (progn
 	    (org-remember-insinuate)
-	    (global-set-key [?\C-c ?r] 'org-remember))))
+	    (global-set-key [?\C-c ?o ?r] 'org-remember))))
 
 ;; Minor mode listing
 
@@ -513,14 +533,14 @@
 ;; Recognising types of files.
 
 (setq auto-mode-alist
-      (append `(("\\.p[lm]$" . perl-mode)
+      (append `(("\\.p[lm]$" . cperl-mode)
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
 		("\\.cs$" . csharp-mode)
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
 		("\\.make$" . makefile-mode)
-		("\\.mkd$" . markdown-mode)
+		("\\.mk?d$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -555,7 +575,8 @@
       (append `(("runlisp" . lisp-mode)
 		("@BASH@" . sh-mode)
 		("@PYTHON@" . python-mode)
-		("@PERL@" . perl-mode)
+		("@PERL@" . cperl-mode)
+		("/perl" . cperl-mode)
 		("@TCLSH@" . tcl-mode)
 		("@WISH@" . tcl-mode)
 		("/tclsh" . tcl-mode)
@@ -583,7 +604,7 @@
 	tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
 	conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
 	a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
-	TeX-mode-hook LaTeX-mode-hook
+	scala-mode-hook TeX-mode-hook LaTeX-mode-hook
 	TeXinfo-mode-hook tex-mode-hook latex-mode-hook
 	texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
 	lisp-mode-hook lisp-interaction-mode-hook makefile-mode-hook
@@ -593,7 +614,6 @@
 	arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
-(defalias 'perl-mode 'cperl-mode)
 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.
@@ -669,6 +689,7 @@
   (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
   (add-hook 'java-mode-hook 'mdw-fontify-java t)
+  (add-hook 'scala-mode-hook 'mdw-fontify-scala t)
   (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
   (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
   (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t)