X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/38c4723941d89854a84c72251f2bc72c664d1ddf..8ea7c4ee5a1188212c01aa81a007600d43605c7e:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 170b049..fb43bf7 100644
--- 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.