X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/36eabf61b2903d8cc1c3b07dca0975ff8d929191..b834ced3b4b80a75fd31eb90764fffa8499dc814:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 9b9b939..9453332 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -2211,14 +2211,23 @@ (defun mdw-fontify-java ()
   ;; Now define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((java-keywords
-	 (mdw-regexps "abstract" "boolean" "break" "byte" "case" "catch"
-		      "char" "class" "const" "continue" "default" "do"
-		      "double" "else" "extends" "final" "finally" "float"
-		      "for" "goto" "if" "implements" "import" "instanceof"
-		      "int" "interface" "long" "native" "new" "package"
-		      "private" "protected" "public" "return" "short"
-		      "static" "switch" "synchronized" "throw" "throws"
-		      "transient" "try" "void" "volatile" "while"))
+	 (mdw-regexps "abstract" "assert"
+		      "boolean" "break" "byte"
+		      "case" "catch" "char" "class" "const" "continue"
+		      "default" "do" "double"
+		      "else" "enum" "extends"
+		      "final" "finally" "float" "for"
+		      "goto"
+		      "if" "implements" "import" "instanceof" "int"
+		      "interface"
+		      "long"
+		      "native" "new"
+		      "package" "private" "protected" "public"
+		      "return"
+		      "short" "static" "strictfp" "switch" "synchronized"
+		      "throw" "throws" "transient" "try"
+		      "void" "volatile"
+		      "while"))
 
 	(java-constants
 	 (mdw-regexps "false" "null" "super" "this" "true")))
@@ -2856,9 +2865,9 @@ (defun mdw-fontify-pythonic (keywords)
 	       '(0 font-lock-keyword-face))
 
 	 ;; At least numbers are simpler than C.
-	 (list (concat "\\_<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-		       "\\_<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|[lL]\\|\\)")
+	 (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
+		       "\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)"
+		       "\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)")
 	       '(0 mdw-number-face))
 
 	 ;; And anything else is punctuation.
@@ -2998,13 +3007,17 @@ (defun mdw-fontify-asm ()
   (modify-syntax-entry ?. "w")
   (modify-syntax-entry ?\n ">")
   (setf fill-prefix nil)
+  (modify-syntax-entry ?. "_")
+  (modify-syntax-entry ?* ". 23")
+  (modify-syntax-entry ?/ ". 124b")
+  (modify-syntax-entry ?\n "> b")
   (local-set-key ";" 'self-insert-command)
   (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)"))
 
 (defun mdw-asm-set-comment ()
   (modify-syntax-entry ?; "."
 		       )
-  (modify-syntax-entry asm-comment-char "<b")
+  (modify-syntax-entry asm-comment-char "< b")
   (setq comment-start (string asm-comment-char ? )))
 (add-hook 'asm-mode-local-variables-hook 'mdw-asm-set-comment)
 (put 'asm-comment-char 'safe-local-variable 'characterp)