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

diff --git a/dot/emacs b/dot/emacs
index 7c2e73f..4705e7e 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)))
 
@@ -84,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)
@@ -494,7 +503,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
 
@@ -518,6 +527,7 @@
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
 		("\\.make$" . makefile-mode)
+		("\\.mk?d$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -575,11 +585,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 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
@@ -665,8 +676,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 +730,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)