Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f21af7f06790f2007f59d5b2ecde7adc11f66b91..a3accbc100f155739ac75eb2eb62d85ebec5b670 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1507,6 +1507,9 @@ (defun mdw-fontify-javascript ()
 
 (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
@@ -1518,7 +1521,7 @@ (defun mdw-fontify-scala ()
                      "var" "while" "with" "yield"))
        (scala-constants
         (mdw-regexps "false" "null" "super" "this" "true"))
-       (punctuation "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"))
+       (punctuation "[-!%^&*=+:@#~/?\\|`]"))
 
     (setq font-lock-keywords
          (list