X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3d6231da04cd7ff9a3480815d4408349a0890d6e..5922f46dcfb0e806e100a7ea50dc8b9bfe7e95d5:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 68c0068..7d60a19 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\\'")
@@ -60,6 +60,9 @@
      (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)))
 
@@ -482,6 +485,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))))
 
@@ -516,6 +520,7 @@
 		("\\.go$" . go-mode)
 		("\\.org$" . org-mode)
 		("\\.make$" . makefile-mode)
+		("\\.mkd$" . markdown-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -573,11 +578,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
+	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,6 +671,8 @@
   (add-hook 'java-mode-hook 'mdw-fontify-java 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)
 
@@ -714,6 +722,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)