X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/a58a42273e2fc34e9c5c4acce337636d73a572e5..8e23492934369e1d9121e1543b963e974ca0bc19:/el/dot-emacs.el?ds=inline

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index fbc3899..f797b17 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -254,6 +254,7 @@ frame is actually mapped on the screen."
 
 (mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus)
 (mdw-advise-to-inhibit-raise-frame appt-disp-window)
+(mdw-advise-to-inhibit-raise-frame mouse-select-window)
 
 ;; Bug fix for markdown-mode, which breaks point positioning during
 ;; `query-replace'.
@@ -1034,8 +1035,7 @@ If NEW-SESSION-P, start a new session."
   '(define-key w3m-mode-map [?\e ?\r] 'w3m-view-this-url-new-session))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-chromium
-    browse-url-mozilla
+  '(browse-url-mozilla
     browse-url-generic
     (w3m . mdw-w3m-browse-url)
     browse-url-w3)
@@ -2201,20 +2201,33 @@ name, as a symbol."
 
 (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")))
@@ -2636,6 +2649,7 @@ name, as a symbol."
 (defun mdw-fontify-rust ()
 
   ;; Hack syntax categories.
+  (modify-syntax-entry ?% ".")
   (modify-syntax-entry ?= ".")
 
   ;; Fontify keywords and things.
@@ -2852,9 +2866,9 @@ strip numbers instead."
 	       '(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]+\\|[oO]?[0-7]+\\|[bB][01]+\\)\\|"
+		       "\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)"
+		       "\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)")
 	       '(0 mdw-number-face))
 
 	 ;; And anything else is punctuation.
@@ -2994,13 +3008,17 @@ strip numbers instead."
   (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)
@@ -3151,6 +3169,8 @@ strip numbers instead."
   (local-set-key [?*] 'mdw-rexx-electric-*)
   (mapcar #'(lambda (ch) (modify-syntax-entry ch "w"))
 	  '(?! ?? ?# ?@ ?$))
+  (mapcar #'(lambda (ch) (modify-syntax-entry ch "."))
+	  '(?¬))
   (mdw-standard-fill-prefix "\\([ \t]*/?\*[ \t]*\\)")
 
   ;; Set up keywords and things for fontification.
@@ -3492,6 +3512,11 @@ strip numbers instead."
       LaTeX-fill-break-at-separators '(\\\[))
 
 ;;;--------------------------------------------------------------------------
+;;; HTML, CSS, and other web foolishness.
+
+(setq css-indent-offset 2)
+
+;;;--------------------------------------------------------------------------
 ;;; SGML hacking.
 
 (defun mdw-sgml-mode ()