X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f7856acd3a66154d543563951408697d8f86d48f..7fce54c3b09700595e14f0d5b35f1103cb9086de:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index ffe360a..d594b17 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -757,7 +757,7 @@ case."
   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (if (fboundp 'hs-minor-mode)
-      (hs-minor-mode t)
+      (trap (hs-minor-mode t))
     (outline-minor-mode t))
   (reveal-mode t)
   (trap (turn-on-font-lock)))
@@ -916,6 +916,7 @@ doesn't match any of the regular expressions in
 (mdw-define-face font-lock-string-face
   (((class mono)) :weight bold)
   (((class color)) :foreground "SkyBlue1"))
+
 (mdw-define-face message-separator
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text
@@ -966,6 +967,10 @@ doesn't match any of the regular expressions in
   (((class color) (type x)) :background "RoyalBlue4")
   (t :underline t))
 
+(mdw-define-face dylan-header-background
+  (((class color) (type x)) :background "NavyBlue")
+  (t :background "blue"))
+
 (mdw-define-face magit-diff-add
   (t :foreground "green"))
 (mdw-define-face magit-diff-del
@@ -974,6 +979,9 @@ doesn't match any of the regular expressions in
   (t :weight bold))
 (mdw-define-face magit-diff-hunk-header
   (t :foreground "SkyBlue1"))
+(mdw-define-face magit-item-highlight
+  (((type tty)) :background "blue")
+  (t :background "DarkSeaGreen4"))
 
 (mdw-define-face erc-input-face
   (t :foreground "red"))
@@ -1861,9 +1869,9 @@ strip numbers instead."
 
 	 ;; And anything else is punctuation.
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face)))
+	       '(0 mdw-punct-face))))
 
-  (mdw-post-config-mode-hack))
+  (mdw-post-config-mode-hack)
   (run-hooks 'arm-assembler-mode-hook))
 
 ;;;--------------------------------------------------------------------------
@@ -1893,6 +1901,118 @@ strip numbers instead."
   (mdw-post-config-mode-hack))
 
 ;;;--------------------------------------------------------------------------
+;;; Dylan programming configuration.
+
+(defun mdw-fontify-dylan ()
+
+  (make-local-variable 'font-lock-keywords)
+
+  ;; Horrors.  `dylan-mode' sets the `major-mode' name after calling this
+  ;; hook, which undoes all of our configuration.
+  (setq major-mode 'dylan-mode)
+  (font-lock-set-defaults)
+
+  (let* ((word "[-_a-zA-Z!*@<>$%]+")
+	 (dylan-keywords (mdw-regexps
+
+			  "C-address" "C-callable-wrapper" "C-function"
+			  "C-mapped-subtype" "C-pointer-type" "C-struct"
+			  "C-subtype" "C-union" "C-variable"
+
+			  "above" "abstract" "afterwards" "all"
+			  "begin" "below" "block" "by"
+			  "case" "class" "cleanup" "constant" "create"
+			  "define" "domain"
+			  "else" "elseif" "end" "exception" "export"
+			  "finally" "for" "from" "function"
+			  "generic"
+			  "handler"
+			  "if" "in" "instance" "interface" "iterate"
+			  "keyed-by"
+			  "let" "library" "local"
+			  "macro" "method" "module"
+			  "otherwise"
+			  "profiling"
+			  "select" "slot" "subclass"
+			  "table" "then" "to"
+			  "unless" "until" "use"
+			  "variable" "virtual"
+			  "when" "while"))
+	 (sharp-keywords (mdw-regexps
+			  "all-keys" "key" "next" "rest" "include"
+			  "t" "f")))
+    (setq font-lock-keywords
+	  (list (list (concat "\\<\\(" dylan-keywords
+			      "\\|" (concat "with\\(out\\)?-" word)
+			      "\\|" (concat word ":")
+			      "\\)\\>")
+		      '(0 font-lock-keyword-face))
+		(list (concat "#\\(" sharp-keywords "\\)\\>")
+		      '(0 font-lock-variable-name-face))
+		(list (concat "\\("
+			      "\\([-+]\\|\\<\\)[0-9]+" "\\("
+				"\\(\\.[0-9]+\\)?" "\\([eE][-+][0-9]+\\)?"
+				"\\|" "/[0-9]+"
+			      "\\)"
+			      "\\|" "\\.[0-9]+" "\\([eE][-+][0-9]+\\)?"
+			      "\\|" "#b[01]+"
+			      "\\|" "#o[0-7]+"
+			      "\\|" "#x[0-9a-zA-Z]+"
+			      "\\)\\>")
+		      '(0 mdw-number-face))
+		(list (concat "\\("
+			      "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\|"
+			      "\\_<[-+*/=<>:&|]+\\_>"
+			      "\\)")
+		      '(0 mdw-punct-face)))))
+
+  (mdw-post-config-mode-hack))
+
+;;;--------------------------------------------------------------------------
+;;; Algol 68 configuration.
+
+(setq a68-indent-step 2)
+
+(defun mdw-fontify-algol-68 ()
+
+  ;; Fix up the syntax table.
+  (modify-syntax-entry ?# "!" a68-mode-syntax-table)
+  (dolist (ch '(?- ?+ ?= ?< ?> ?* ?/ ?| ?&))
+    (modify-syntax-entry ch "." a68-mode-syntax-table))
+
+  (make-local-variable 'font-lock-keywords)
+
+  (let ((not-comment
+	 (let ((word "COMMENT"))
+	   (do ((regexp (concat "[^" (substring word 0 1) "]+")
+			(concat regexp "\\|"
+				(substring word 0 i)
+				"[^" (substring word i (1+ i)) "]"))
+		(i 1 (1+ i)))
+	       ((>= i (length word)) regexp)))))
+    (setq font-lock-keywords
+	  (list (list (concat "\\<COMMENT\\>"
+			      "\\(" not-comment "\\)\\{0,5\\}"
+			      "\\(\\'\\|\\<COMMENT\\>\\)")
+		      '(0 font-lock-comment-face))
+		(list (concat "\\<CO\\>"
+			      "\\([^C]+\\|C[^O]\\)\\{0,5\\}"
+			      "\\($\\|\\<CO\\>\\)")
+		      '(0 font-lock-comment-face))
+		(list "\\<[A-Z_]+\\>"
+		      '(0 font-lock-keyword-face))
+		(list (concat "\\<"
+			      "[0-9]+"
+			      "\\(\\.[0-9]+\\)?"
+			      "\\([eE][-+]?[0-9]+\\)?"
+			      "\\>")
+		      '(0 mdw-number-face))
+		(list "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"
+		      '(0 mdw-punct-face)))))
+
+  (mdw-post-config-mode-hack))
+
+;;;--------------------------------------------------------------------------
 ;;; REXX configuration.
 
 (defun mdw-rexx-electric-* ()