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

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 78a456b..9453332 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -963,6 +963,12 @@ (defadvice find-file (after mdw-autorevert activate)
 (defadvice write-file (after mdw-autorevert activate)
   (mdw-check-autorevert))
 
+(defun mdw-auto-revert ()
+  "Recheck all of the autorevertable buffers, and update VC modelines."
+  (interactive)
+  (let ((auto-revert-check-vc-info t))
+    (auto-revert-buffers)))
+
 ;;;--------------------------------------------------------------------------
 ;;; Dired hacking.
 
@@ -2195,20 +2201,33 @@ (mdw-set-default-c-style 'java-mode 'mdw-java)
 
 (defun mdw-fontify-java ()
 
+  ;; Fiddle with some syntax codes.
+  (modify-syntax-entry ?@ ".")
+  (modify-syntax-entry ?@ "." font-lock-syntax-table)
+
   ;; Other stuff.
   (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
 
   ;; 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")))
@@ -2640,15 +2659,15 @@ (defun mdw-fontify-rust ()
 		      "const" "continue" "create"
 		      "do"
 		      "else" "enum" "extern"
-		      "false" "final" "fn" "for"
+		      "final" "fn" "for"
 		      "if" "impl" "in"
 		      "let" "loop"
 		      "macro" "match" "mod" "move" "mut"
 		      "offsetof" "override"
-		      "priv" "pub" "pure"
+		      "priv" "proc" "pub" "pure"
 		      "ref" "return"
-		      "self" "sizeof" "static" "struct" "super"
-		      "true" "trait" "type" "typeof"
+		      "sizeof" "static" "struct" "super"
+		      "trait" "type" "typeof"
 		      "unsafe" "unsized" "use"
 		      "virtual"
 		      "where" "while"
@@ -2659,7 +2678,8 @@ (defun mdw-fontify-rust ()
 		      "f32" "f64"
 		      "i8" "i16" "i32" "i64" "isize"
 		      "u8" "u16" "u32" "u64" "usize"
-		      "char" "str")))
+		      "char" "str"
+		      "self" "Self")))
     (setq font-lock-keywords
 	  (list
 
@@ -2845,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.
@@ -2987,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)
@@ -3460,6 +3484,8 @@ (defun mdw-fontify-tex ()
 	 (list "[$^_{}#&]"
 	       '(0 mdw-punct-face)))))
 
+(setq TeX-install-font-lock 'tex-font-setup)
+
 (eval-after-load 'font-latex
   '(defun font-latex-jit-lock-force-redisplay (buf start end)
      "Compatibility for Emacsen not offering `jit-lock-force-redisplay'."