Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  dot/fonts.conf: If `Geneva' is requested, supply `FreeSans'.
  el/dot-emacs.el: Use define-derived-mode to make C# mode.
  el/dot-emacs.el: Org-mode hacking to use Strayman class.
  dot/bash_profile: Read bashrc if it's been lost.
  dot/e16-bindings: Add binding to show menu list.

diff --combined dot/fonts.conf
index 8fc01fdf1fb20b65bfd953373369b734820dacfa,db05e1e5efc2241dd436dbc72afe22ff289b477e..dec89edcf6846eccf250fb5385f8709572642f66
--- 1/dot/fonts.conf
--- 2/dot/fonts.conf
+++ b/dot/fonts.conf
@@@ -56,11 -56,6 +56,11 @@@
      <edit mode="assign" name="pixelsize"><double>13</double></edit>
    </match>
  
 +  <match target="pattern">
 +    <test name="family"><string>Symbol</string></test>
 +    <edit name="foundry"><string>urw</string></edit>
 +  </match>
 +
    <!-- Hacking for the symbol font.
  
         This seems to be necessary to get Iceweasel/Firefox to do the
@@@ -73,6 -68,11 +73,11 @@@
      </edit>
    </match>
  
+   <match targets="pattern">
+     <test name="family"><string>Geneva</string></test>
+     <edit mode="append" name="family"><string>FreeSans</string></edit>
+   </match>
+ 
    <!-- KDE put this here, but it seems worthwhile.
  
         Modified so as to force slight hinting rather than medium,

diff --combined el/dot-emacs.el
index 65db85af77ce62740b8f2dd3c6a1e553cd40735b,170b049dacc56dee7b0ab7848478a9e83db2ed68..fb43bf75455be2387f63313f60dc351eedd33abe
--- 1/el/dot-emacs.el
--- 2/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -229,6 -229,21 +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.
  
@@@ -629,7 -644,6 +644,7 @@@ case.
    (setq show-trailing-whitespace t)
    (and (fboundp 'gtags-mode)
         (gtags-mode))
 +  (hs-minor-mode t)
    (outline-minor-mode t)
    (mdw-set-font))
  
@@@ -846,15 -860,6 +861,15 @@@ doesn't match any of the regular expres
                  (statement-case-intro . +)))
               t))
  
 +(defvar mdw-c-comment-fill-prefix
 +  `((,(concat "\\([ \t]*/?\\)"
 +            "\\(\*\\|//]\\)"
 +            "\\([ \t]*\\)"
 +            "\\([A-Za-z]+:[ \t]*\\)?"
 +            mdw-hanging-indents)
 +     (pad . 1) (match . 2) (pad . 3) (pad . 4) (pad . 5)))
 +  "Fill prefix matching C comments (both kinds).")
 +
  (defun mdw-fontify-c-and-c++ ()
  
    ;; Fiddle with some syntax codes.
@@@ -867,7 -872,12 +882,7 @@@
    (setq c-hanging-comment-ender-p nil)
    (setq c-backslash-column 72)
    (setq c-label-minimum-indentation 0)
 -  (setq mdw-fill-prefix
 -      `((,(concat "\\([ \t]*/?\\)"
 -                  "\\([\*/][ \t]*\\)"
 -                  "\\([A-Za-z]+:[ \t]*\\)?"
 -                  mdw-hanging-indents)
 -         (pad . 1) (match . 2) (pad . 3) (pad . 4))))
 +  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
  
    ;; Now define things to be fontified.
    (make-local-variable 'font-lock-keywords)
@@@ -1036,7 -1046,12 +1051,7 @@@
    (setq c-backslash-column 72)
    (setq comment-start "/* ")
    (setq comment-end " */")
 -  (setq mdw-fill-prefix
 -      `((,(concat "\\([ \t]*/?\\)"
 -                  "\\([\*/][ \t]*\\)"
 -                  "\\([A-Za-z]+:[ \t]*\\)?"
 -                  mdw-hanging-indents)
 -         (pad . 1) (match . 2) (pad . 3) (pad . 4))))
 +  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
  
    ;; Now define things to be fontified.
    (make-local-variable 'font-lock-keywords)
@@@ -1090,7 -1105,14 +1105,7 @@@
    (mdw-java-style)
    (setq c-hanging-comment-ender-p nil)
    (setq c-backslash-column 72)
 -  (setq comment-start "/* ")
 -  (setq comment-end " */")
 -  (setq mdw-fill-prefix
 -      `((,(concat "\\([ \t]*/?\\)"
 -                  "\\([\*/][ \t]*\\)"
 -                  "\\([A-Za-z]+:[ \t]*\\)?"
 -                  mdw-hanging-indents)
 -         (pad . 1) (match . 2) (pad . 3) (pad . 4))))
 +  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
  
    ;; Now define things to be fontified.
    (make-local-variable 'font-lock-keywords)
@@@ -1152,7 -1174,14 +1167,7 @@@
    (mdw-csharp-style)
    (setq c-hanging-comment-ender-p nil)
    (setq c-backslash-column 72)
 -  (setq comment-start "/* ")
 -  (setq comment-end " */")
 -  (setq mdw-fill-prefix
 -      `((,(concat "\\([ \t]*/?\\)"
 -                  "\\([\*/][ \t]*\\)"
 -                  "\\([A-Za-z]+:[ \t]*\\)?"
 -                  mdw-hanging-indents)
 -         (pad . 1) (match . 2) (pad . 3) (pad . 4))))
 +  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
  
    ;; Now define things to be fontified.
    (make-local-variable 'font-lock-keywords)
@@@ -1195,13 -1224,8 +1210,8 @@@
           (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.
@@@ -2138,7 -2162,7 +2148,7 @@@ strip numbers instead.
    (auto-fill-mode 1))
  
  ;;;--------------------------------------------------------------------------
 -;;; Outline mode.
 +;;; Outline and hide/show modes.
  
  (defun mdw-outline-collapse-all ()
    "Completely collapse everything in the entire buffer."
@@@ -2149,8 -2173,6 +2159,8 @@@
        (hide-subtree)
        (forward-line))))
  
 +(setq hs-hide-comments-when-hiding-all nil)
 +
  ;;;--------------------------------------------------------------------------
  ;;; Shell mode.