el/dot-emacs.el: Rename `...-constants' to `...-builtins'.

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 9b9b939..b65c132 100644 (file)
--- 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)
@@ -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.
@@ -2211,16 +2211,25 @@ name, as a symbol."
   ;; 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"))
-
-       (java-constants
+        (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-builtins
         (mdw-regexps "false" "null" "super" "this" "true")))
 
     (setq font-lock-keywords
@@ -2230,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.
@@ -2277,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")))
 
@@ -2288,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.
@@ -2415,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
@@ -2425,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.
@@ -2640,15 +2649,17 @@ name, as a symbol."
 (defun mdw-fontify-rust ()
 
   ;; Hack syntax categories.
+  (modify-syntax-entry ?$ ".")
+  (modify-syntax-entry ?% ".")
   (modify-syntax-entry ?= ".")
 
   ;; Fontify keywords and things.
   (make-local-variable 'font-lock-keywords)
   (let ((rust-keywords
-        (mdw-regexps "abstract" "alignof" "as"
+        (mdw-regexps "abstract" "alignof" "as" "async" "await"
                      "become" "box" "break"
-                     "const" "continue" "create"
-                     "do"
+                     "const" "continue" "crate"
+                     "do" "dyn"
                      "else" "enum" "extern"
                      "final" "fn" "for"
                      "if" "impl" "in"
@@ -2658,8 +2669,8 @@ name, as a symbol."
                      "priv" "proc" "pub" "pure"
                      "ref" "return"
                      "sizeof" "static" "struct" "super"
-                     "trait" "type" "typeof"
-                     "unsafe" "unsized" "use"
+                     "trait" "try" "type" "typeof"
+                     "union" "unsafe" "unsized" "use"
                      "virtual"
                      "where" "while"
                      "yield"))
@@ -2692,7 +2703,7 @@ name, as a symbol."
                               "\\|" "0o[0-7_]+"
                               "\\|" "0b[01_]+"
                               "\\)"
-                              "\\([ui]\\(8\\|16\\|32\\|64\\|s\\|size\\)\\)?"
+                              "\\([ui]\\(8\\|16\\|32\\|64\\|size\\)\\)?"
                         "\\)\\_>")
                 '(0 mdw-number-face))
 
@@ -2856,9 +2867,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.
@@ -2998,13 +3009,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)
@@ -3155,6 +3170,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.
@@ -3496,6 +3513,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 ()