X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2287504f893d7f04037e55e557a770a1838f854f..2285e371c490bc545f9fbf15cbc3f02981b16bc8:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 10eddb2..b24e50c 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -2074,11 +2074,11 @@ strip numbers instead."
 			  "t" "f")))
     (setq font-lock-keywords
 	  (list (list (concat "\\<\\(" dylan-keywords
-			      "\\|" (concat "with\\(out\\)?-" word)
-			      "\\|" (concat word ":")
+			      "\\|" "with\\(out\\)?-" word
 			      "\\)\\>")
 		      '(0 font-lock-keyword-face))
-		(list (concat "#\\(" sharp-keywords "\\)\\>")
+		(list (concat "\\<" word ":" "\\|"
+			      "#\\(" sharp-keywords "\\)\\>")
 		      '(0 font-lock-variable-name-face))
 		(list (concat "\\("
 			      "\\([-+]\\|\\<\\)[0-9]+" "\\("
@@ -2276,10 +2276,8 @@ strip numbers instead."
 (defun mdw-fontify-haskell ()
 
   ;; Fiddle with syntax table to get comments right.
-  (modify-syntax-entry ?' "\"")
-  (modify-syntax-entry ?- ". 123")
-  (modify-syntax-entry ?{ ". 1b")
-  (modify-syntax-entry ?} ". 4b")
+  (modify-syntax-entry ?' "_")
+  (modify-syntax-entry ?- ". 12")
   (modify-syntax-entry ?\n ">")
 
   ;; Make punctuation be punctuation
@@ -2294,20 +2292,57 @@ strip numbers instead."
   ;; Fiddle with fontification.
   (make-local-variable 'font-lock-keywords)
   (let ((haskell-keywords
-	 (mdw-regexps "as" "case" "ccall" "class" "data" "default"
-		      "deriving" "do" "else" "foreign" "hiding" "if"
-		      "import" "in" "infix" "infixl" "infixr" "instance"
-		      "let" "module" "newtype" "of" "qualified" "safe"
-		      "stdcall" "then" "type" "unsafe" "where")))
+	 (mdw-regexps "as"
+		      "case" "ccall" "class"
+		      "data" "default" "deriving" "do"
+		      "else" "exists"
+		      "forall" "foreign"
+		      "hiding"
+		      "if" "import" "in" "infix" "infixl" "infixr" "instance"
+		      "let"
+		      "mdo" "module"
+		      "newtype"
+		      "of"
+		      "proc"
+		      "qualified"
+		      "rec"
+		      "safe" "stdcall"
+		      "then" "type"
+		      "unsafe"
+		      "where"))
+	(control-sequences
+	 (mdw-regexps "ACK" "BEL" "BS" "CAN" "CR" "DC1" "DC2" "DC3" "DC4"
+		      "DEL" "DLE" "EM" "ENQ" "EOT" "ESC" "ETB" "ETX" "FF"
+		      "FS" "GS" "HT" "LF" "NAK" "NUL" "RS" "SI" "SO" "SOH"
+		      "SP" "STX" "SUB" "SYN" "US" "VT")))
 
     (setq font-lock-keywords
 	  (list
-	   (list "--.*$"
+	   (list (concat "{-" "[^-]*" "\\(-+[^-}][^-]*\\)*"
+			      "\\(-+}\\|-*\\'\\)"
+			 "\\|"
+			 "--.*$")
 		 '(0 font-lock-comment-face))
-	   (list (concat "\\<\\(" haskell-keywords "\\)\\>")
+	   (list (concat "\\_<\\(" haskell-keywords "\\)\\_>")
 		 '(0 font-lock-keyword-face))
-	   (list (concat "\\<0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "\\<[0-9][0-9_]*\\(\\.[0-9]*\\|\\)"
+	   (list (concat "'\\("
+			 "[^\\]"
+			 "\\|"
+			 "\\\\"
+			 "\\(" "[abfnrtv\\\"']" "\\|"
+			       "^" "\\(" control-sequences "\\|"
+					 "[]A-Z@[\\^_]" "\\)" "\\|"
+			       "\\|"
+			       "[0-9]+" "\\|"
+			       "[oO][0-7]+" "\\|"
+			       "[xX][0-9A-Fa-f]+"
+			 "\\)"
+			 "\\)'")
+		 '(0 font-lock-string-face))
+	   (list "\\_<[A-Z]\\(\\sw+\\|\\s_+\\)*\\_>"
+		 '(0 font-lock-variable-name-face))
+	   (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[oO][0-7]+\\)\\|"
+			 "\\_<[0-9]+\\(\\.[0-9]*\\|\\)"
 			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)")
 		 '(0 mdw-number-face))
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"