X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/87def30c773641959e14aedde43e4af6639f7d1f..300f8827af208febfc730bb14f246e61781e09a7:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 24c2afa..b65c132 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -2080,7 +2080,7 @@ name, as a symbol."
 		      "__typeof__"	 ;GCC
 		      "__volatile__"	 ;GCC
 		      ))
-	(c-constants
+	(c-builtins
 	 (mdw-regexps "false"		 ;C++, C99 macro
 		      "this"		 ;C++
 		      "true"		 ;C++, C99 macro
@@ -2116,7 +2116,7 @@ name, as a symbol."
 	   (list (concat "\\<\\(" c-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
-	   (list (concat "\\<\\(" c-constants "\\)\\>")
+	   (list (concat "\\<\\(" c-builtins "\\)\\>")
 		 '(0 font-lock-variable-name-face))
 
 	   ;; Handle numbers too.
@@ -2229,7 +2229,7 @@ name, as a symbol."
 		      "void" "volatile"
 		      "while"))
 
-	(java-constants
+	(java-builtins
 	 (mdw-regexps "false" "null" "super" "this" "true")))
 
     (setq font-lock-keywords
@@ -2239,8 +2239,8 @@ name, as a symbol."
 	   (list (concat "\\<\\(" java-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
-	   ;; Handle the magic constants defined above.
-	   (list (concat "\\<\\(" java-constants "\\)\\>")
+	   ;; Handle the magic builtins defined above.
+	   (list (concat "\\<\\(" java-builtins "\\)\\>")
 		 '(0 font-lock-variable-name-face))
 
 	   ;; Handle numbers too.
@@ -2286,7 +2286,7 @@ name, as a symbol."
 
 		      "boolean" "byte" "char" "double" "float" "int" "long"
 		      "short" "void"))
-	(javascript-constants
+	(javascript-builtins
 	 (mdw-regexps "false" "null" "undefined" "Infinity" "NaN" "true"
 		      "arguments" "this")))
 
@@ -2297,8 +2297,8 @@ name, as a symbol."
 	   (list (concat "\\_<\\(" javascript-keywords "\\)\\_>")
 		 '(0 font-lock-keyword-face))
 
-	   ;; Handle the predefined constants defined above.
-	   (list (concat "\\_<\\(" javascript-constants "\\)\\_>")
+	   ;; Handle the predefined builtins defined above.
+	   (list (concat "\\_<\\(" javascript-builtins "\\)\\_>")
 		 '(0 font-lock-variable-name-face))
 
 	   ;; Handle numbers too.
@@ -2424,7 +2424,7 @@ name, as a symbol."
 		      "unsafe" "ushort" "using" "virtual" "void" "volatile"
 		      "while" "yield"))
 
-	(csharp-constants
+	(csharp-builtins
 	 (mdw-regexps "base" "false" "null" "this" "true")))
 
     (setq font-lock-keywords
@@ -2434,8 +2434,8 @@ name, as a symbol."
 	   (list (concat "\\<\\(" csharp-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
-	   ;; Handle the magic constants defined above.
-	   (list (concat "\\<\\(" csharp-constants "\\)\\>")
+	   ;; Handle the magic builtins defined above.
+	   (list (concat "\\<\\(" csharp-builtins "\\)\\>")
 		 '(0 font-lock-variable-name-face))
 
 	   ;; Handle numbers too.
@@ -2649,6 +2649,7 @@ name, as a symbol."
 (defun mdw-fontify-rust ()
 
   ;; Hack syntax categories.
+  (modify-syntax-entry ?$ ".")
   (modify-syntax-entry ?% ".")
   (modify-syntax-entry ?= ".")