el/dot-emacs.el: New face `mdw-trivial-face'.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f207a0a..f039bab 100644 (file)
--- 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)))
 
@@ -518,6 +520,7 @@
                ("\\.go$" . go-mode)
                ("\\.org$" . org-mode)
                ("\\.make$" . makefile-mode)
+               ("\\.mk?d$" . markdown-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"
@@ -579,7 +582,8 @@
        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
+       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 +669,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 +723,8 @@
 (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