X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/7fce54c3b09700595e14f0d5b35f1103cb9086de..af3f85f6ff483bcdb483bae504d802433b742a68:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 920b370..1449f73 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)))
 
@@ -579,7 +581,7 @@
 	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
-	a68-mode-hook a68-mode-hooks asm-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
@@ -668,6 +670,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)