Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 41e15d3e05e09b7f7e7c43a06c7e7dd14c2a9366..132278963823441ea4fa2731798fd9cf6474401e 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -229,6 +229,21 @@      (define-key keymap key nil))
        (dolist (key replacements)
          (define-key keymap key binding))))))
 
+(eval-after-load "org"
+  '(progn
+     (push '("strayman"
+            "\\documentclass{strayman}
+\\usepackage[utf8]{inputenc}
+\\usepackage[palatino, helvetica, courier, maths=cmr]{mdwfonts}
+\\usepackage[T1]{fontenc}
+\\usepackage{graphicx, tikz, mdwtab, mdwmath, crypto, longtable}"
+            ("\\section{%s}" . "\\section*{%s}")
+            ("\\subsection{%s}" . "\\subsection*{%s}")
+            ("\\subsubsection{%s}" . "\\subsubsection*{%s}")
+            ("\\paragraph{%s}" . "\\paragraph*{%s}")
+            ("\\subparagraph{%s}" . "\\subparagraph*{%s}"))
+          org-export-latex-classes)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Mail and news hacking.
 
@@ -1209,13 +1224,8 @@ (defun mdw-fontify-csharp ()
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                 '(0 mdw-punct-face))))))
 
-(defun csharp-mode ()
-  (interactive)
-  (java-mode)
-  (setq major-mode 'csharp-mode)
-  (setq mode-name "C#")
-  (mdw-fontify-csharp)
-  (run-hooks 'csharp-mode-hook))
+(define-derived-mode csharp-mode java-mode "C#"
+  "Major mode for editing C# code.")
 
 ;;;--------------------------------------------------------------------------
 ;;; Awk programming configuration.