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 --git a/dot/bash_profile b/dot/bash_profile
index ffea97f7de2bde283c11f5ed7c5374ac98164055..e45fe4154840034eade7f564c458a1592c4552be 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -232,11 +232,11 @@ fi
 
 [ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
 
+fi
+
 # --- Now, if my .bashrc hasn't been run yet, run it ---
 #
 # Oh, don't do that if we don't have a terminal.
 
 [ -z "$__mdw_bashrc" ] && [ -t 0 ] && \
   [ -r $HOME/.bashrc ] && . $HOME/.bashrc
-
-fi

diff --git a/dot/e16-bindings b/dot/e16-bindings
index 45493bcd7e317d0aa386f291f3dd5eb9a8871f45..c2cf4be2b2aca9707270c518494d6f61cdb424eb 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -4,6 +4,7 @@ MouseDouble   CA 1 wop * shade
 MouseDown     CA 2 wop * sz ptr
 MouseDouble   CA 2 wop * th available
 MouseDown     CA 3 menus show winops.menu
+MouseDown     C5 3 menus show windowlist
 Aclass DESKBINDINGS normal
 Tooltip Clicking your mouse on the desktop will perform
 Tooltip the following actions

diff --git a/dot/fonts.conf b/dot/fonts.conf
index 8fc01fdf1fb20b65bfd953373369b734820dacfa..dec89edcf6846eccf250fb5385f8709572642f66 100644 (file)
--- a/dot/fonts.conf
+++ b/dot/fonts.conf
@@ -73,6 +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 --git a/el/dot-emacs.el b/el/dot-emacs.el
index 65db85af77ce62740b8f2dd3c6a1e553cd40735b..fb43bf75455be2387f63313f60dc351eedd33abe 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.
 
@@ -1195,13 +1210,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.