X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/01a478c25beae3abbed42c8515ff7d7b1b2157a4..4d60a7ac95f814edd26bc558b486968a5a0728a0:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 7c2e73f..e1a5d6e 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -60,7 +60,9 @@
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (setq magit-log-cutoff-length 512)
-(add-hook 'magit-mode-hook 'magit-load-config-extensions)
+(defun mdw-magit-try-load-config-extensions ()
+  (trap (magit-load-config-extensions)))
+(add-hook 'magit-mode-hook 'mdw-magit-try-load-config-extensions)
 
 (trap (or mdw-fast-startup (require 'p4)))
 
@@ -82,7 +84,20 @@
 
 (require 'paren)
 (trap (show-paren-mode t))
-(or window-system (menu-bar-mode -1))
+(or window-system (>= emacs-major-version 22) (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)
+
+;; Rust mode.
+
+(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/")))
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
 ;; Temporary directory handling.
 
@@ -116,7 +131,8 @@
 
 (setq mdw-backup-disable-regexps
       '("/\\.git/COMMIT_EDITMSG$"
-	"/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
+	"/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"
+	"^/tmp/" "^/var/tmp/"))
 
 ;; Safe variables.
 
@@ -139,7 +155,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)
@@ -147,6 +166,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))
@@ -279,6 +300,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.
 
@@ -291,7 +319,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)
@@ -407,23 +435,28 @@
 ;; Default frame size.
 
 (setq default-frame-alist
-      (mdw-uniquify-alist
-       '((width . 78)
-	 (height . 33)
-	 (vertical-scroll-bars . right)
-	 (cursor-type . bar)
-	 (cursor-blink . t)
-	 (left-fringe . 5)
-	 (right-fringe . 5)
-	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
-(setq window-system-default-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+	(height . 33)
+	(vertical-scroll-bars . right)
+	(cursor-type . bar)
+	(cursor-blink . t)
+	(left-fringe . 5)
+	(right-fringe . 5)
+	(scroll-bar-width . 15)
+	(tool-bar-lines . 0)
+	(menu-bar-lines . 1)
+	(cursor-color . "red")
+	(background-mode . ,(if mdw-black-background 'dark 'light)))
+      initial-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+	(menu-bar-lines . ,(if window-system 1 0)))
+      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.
@@ -437,6 +470,8 @@
 (setq windmove-wrap-around t)
 (trap (iswitchb-mode))
 (progn
+  (global-set-key [?\e ?\e] 'mdw-wrong)
+  (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-x ?w left] 'windmove-left)
   (global-set-key [?\C-x ?w ?h] 'windmove-left)
   (global-set-key [?\C-x ?w up] 'windmove-up)
@@ -475,6 +510,9 @@
 		  #'(lambda () (interactive)))
   (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
+  (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
 
@@ -494,7 +532,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
 
@@ -511,13 +549,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)
+		("\\.mk?d$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -552,11 +591,12 @@
       (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)
-		("/wish" . tcl-mode))
+		("tclsh" . tcl-mode)
+		("wish" . tcl-mode))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions
@@ -575,11 +615,12 @@
 
 (mapc (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
       '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
-	csharp-mode-hook perl-mode-hook cperl-mode-hook
+	csharp-mode-hook perl-mode-hook cperl-mode-hook dylan-mode-hook
 	python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
 	tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
 	conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
-	asm-mode-hook TeX-mode-hook LaTeX-mode-hook
+	a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
+	scala-mode-hook rust-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
@@ -589,7 +630,6 @@
 	arm-assembler-mode-hook))
 
 (global-font-lock-mode t)
-(defalias 'perl-mode 'cperl-mode)
 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.
@@ -658,6 +698,7 @@
   (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
+  (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
 
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)
 
@@ -665,8 +706,11 @@
   (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)
+  (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp t)
 
   (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
 
@@ -716,6 +760,10 @@
 (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
 (add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t)
 
+(add-hook 'a68-mode-hook 'mdw-fontify-algol-68 t)
+(add-hook 'a68-mode-hooks 'mdw-fontify-algol-68 t)
+(add-hook 'dylan-mode-hook 'mdw-fontify-dylan t)
+
 (progn
   (add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'scheme-mode-hook 'mdw-fontify-lispy t)