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.

diff --combined el/dot-emacs.el
index 132278963823441ea4fa2731798fd9cf6474401e,15b156bd22d670bdcce58c3c3f3de6342d9a4610..170b049dacc56dee7b0ab7848478a9e83db2ed68
--- 1/el/dot-emacs.el
--- 2/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.