X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c6fe19d5ddff128cc87fabcd0e7f82be6af19781..a0d16e44fe6acd44350922958f063a7598cd8b36:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f21af7f..eb30141 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -573,10 +573,10 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-generic
+  '(browse-url-mozilla
+    browse-url-generic
     (w3m . mdw-w3m-browse-url)
-    browse-url-w3
-    browse-url-mozilla)
+    browse-url-w3)
   "List of good browsers for mdw-good-url-browsers.
 Each item is a browser function name, or a cons (CHECK . FUNC).
 A symbol FOO stands for (FOO . FOO).")
@@ -1507,6 +1507,9 @@ 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
@@ -1518,7 +1521,7 @@ doesn't match any of the regular expressions in
 		      "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