X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/56becc91d2ddf9e00600dc55fd129b92147eace1..03f7e611ae3208e41ee76bfa59d3fee0a772eefd:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index fe2f7be..c0f4022 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -46,8 +46,8 @@
      (add-to-list 'auto-mode-alist
 		  `(,(concat "/debian/"
 			       "\\("
-				 "[" "[:lower:][:digit:]]"
-				     "[[:lower:][:digit:].+-" "]+"
+				 "[" "[:lower:]" "[:digit:]" "]"
+				 "[" "[:lower:]" "[:digit:]" ".+-" "]+"
 				 "\\."
 			       "\\)?"
 			       "changelog\\'")
@@ -59,6 +59,11 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+(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)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
@@ -81,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)
@@ -136,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)
@@ -144,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))
@@ -210,7 +227,7 @@
 (setq dabbrev-case-replace nil)		;Retain case when completing
 (setq linum-format "%7d ")
 (setq next-line-add-newlines nil)	;Don't add weird newlines
-(setq split-height-threshold 45)	;Reuse windows where sensible
+(setq split-height-threshold nil)	;Reuse windows where sensible
 (setq display-buffer-reuse-frames nil	;Don't confuse me by showing buffers
       iswitchb-default-method 'samewindow) ;in other random frames
 (setq dired-deletion-confirmer		;Make deletion easier in dired
@@ -290,7 +307,8 @@
       browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
-(setq w3m-default-display-inline-images t)
+(setq w3m-default-display-inline-images t
+      w3m-use-cookies t)
 
 (eval-after-load "w3m"
   '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
@@ -404,7 +422,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)
@@ -412,10 +430,8 @@
 	 (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")
@@ -479,6 +495,7 @@
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
 	 (define-key dired-mode-map [?\C-x ?\C-q]
 	   'wdired-change-to-wdired-mode))
+     (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
 	  (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
 
@@ -489,7 +506,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
 
@@ -512,6 +529,8 @@
 		("\\.cs$" . csharp-mode)
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
+		("\\.make$" . makefile-mode)
+		("\\.mk?d$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -544,10 +563,13 @@
 
 (setq interpreter-mode-alist
       (append `(("runlisp" . lisp-mode)
+		("@BASH@" . sh-mode)
 		("@PYTHON@" . python-mode)
 		("@PERL@" . perl-mode)
 		("@TCLSH@" . tcl-mode)
-		("@WISH@" . tcl-mode))
+		("@WISH@" . tcl-mode)
+		("/tclsh" . tcl-mode)
+		("/wish" . tcl-mode))
 	      interpreter-mode-alist))
 
 (setq completion-ignored-extensions
@@ -566,11 +588,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 conf-mode-hook
-	m4-mode-hook autoconf-mode-hook autotest-mode-hook
-	asm-mode-hook TeX-mode-hook LaTeX-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
+	a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-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
@@ -656,8 +679,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)
 
@@ -707,6 +733,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)