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/fonts.conf b/dot/fonts.conf
index db05e1e5efc2241dd436dbc72afe22ff289b477e..dec89edcf6846eccf250fb5385f8709572642f66 100644 (file)
--- a/dot/fonts.conf
+++ b/dot/fonts.conf
@@ -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

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 170b049dacc56dee7b0ab7848478a9e83db2ed68..fb43bf75455be2387f63313f60dc351eedd33abe 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -644,6 +644,7 @@ (defun mdw-misc-mode-config ()
   (setq show-trailing-whitespace t)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
+  (hs-minor-mode t)
   (outline-minor-mode t)
   (mdw-set-font))
 
@@ -860,6 +861,15 @@              (defun-open . (add 0 c-indent-one-line-block))
                  (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.
@@ -872,12 +882,7 @@ (defun mdw-fontify-c-and-c++ ()
   (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)
@@ -1046,12 +1051,7 @@ (defun mdw-fontify-apcalc ()
   (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)
@@ -1105,14 +1105,7 @@ (defun mdw-fontify-java ()
   (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)
@@ -1174,14 +1167,7 @@ (defun mdw-fontify-csharp ()
   (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)
@@ -2162,7 +2148,7 @@ (defun mdw-text-mode ()
   (auto-fill-mode 1))
 
 ;;;--------------------------------------------------------------------------
-;;; Outline mode.
+;;; Outline and hide/show modes.
 
 (defun mdw-outline-collapse-all ()
   "Completely collapse everything in the entire buffer."
@@ -2173,6 +2159,8 @@ (defun mdw-outline-collapse-all ()
       (hide-subtree)
       (forward-line))))
 
+(setq hs-hide-comments-when-hiding-all nil)
+
 ;;;--------------------------------------------------------------------------
 ;;; Shell mode.