From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 23 Oct 2009 15:50:48 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/b82e6811f093c01610949200022b96f6b0ecc288?ds=inline;hp=-c

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

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile:
  dot/emacs: Turn off fancy double-quote handling in TeX modes.
  dot/emacs: Make C-x C-q do editable-Dired.
  git/gitconfig: Add diff rules for Lisp.
  dot/fonts.conf: The saga never ends.
  el/dot-emacs.el: Fix stupid botch in earlier Python mode hacking.
---

b82e6811f093c01610949200022b96f6b0ecc288
diff --combined el/dot-emacs.el
index 1322789,15b156b..170b049
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -229,21 -229,6 +229,21 @@@ Evil key bindings are defined in `mdw-e
  	(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.
  
@@@ -1224,8 -1209,13 +1224,8 @@@ doesn't match any of the regular expres
  	   (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.
@@@ -1361,7 -1351,7 +1361,7 @@@ strip numbers instead.
  	(list
  
  	 ;; Set up the keywords defined above.
- 	 (list (concat "\\<\\(" python-keywords "\\)\\>")
+ 	 (list (concat "\\<\\(" keywords "\\)\\>")
  	       '(0 font-lock-keyword-face))
  
  	 ;; At least numbers are simpler than C.