From: Mark Wooding <mwooding@good.com>
Date: Mon, 17 Mar 2014 12:39:11 +0000 (+0000)
Subject: el/dot-emacs.el: Scala fontification fettling.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/7b5903d85319addd6399a1e07a5f1b1204035885

el/dot-emacs.el: Scala fontification fettling.

The Scala mode is trying to do something clever with comment filling.
Try to dissuade it.  Also, use an explicit list of punctuation
characters, because Scala mode (quite rightly) does a lot of fiddling
with syntax tables.
---

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index e341b93..2c5fa53 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1495,6 +1495,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
@@ -1506,7 +1509,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