X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ee7c3dea8fe987cd50c99f82b168db1de6db4cd7..7b5903d85319addd6399a1e07a5f1b1204035885:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f8141dc..2c5fa53 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1495,18 +1495,21 @@ doesn't match any of the regular expressions in
 
 (defun mdw-fontify-scala ()
 
+  ;; Comment filling.
+  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
+
   ;; Define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((scala-keywords
 	 (mdw-regexps "abstract" "case" "catch" "class" "def" "do" "else"
 		      "extends" "final" "finally" "for" "forSome" "if"
 		      "implicit" "import" "lazy" "match" "new" "object"
-		      "override" "package" "protected" "return" "sealed"
-		      "super" "this" "throw" "trait" "try" "type" "val"
+		      "override" "package" "private" "protected" "return"
+		      "sealed" "throw" "trait" "try" "type" "val"
 		      "var" "while" "with" "yield"))
 	(scala-constants
-	 (mdw-regexps "false" "null" "true"))
-	(punctuation "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"))
+	 (mdw-regexps "false" "null" "super" "this" "true"))
+	(punctuation "[-!%^&*=+:@#~/?\\|`]"))
 
     (setq font-lock-keywords
 	  (list