X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1b239a706933a7252f4a737db92b70f294320d8f..0191c356991d51c055fd7818adcbcc91fa348214:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d783024..2f347d6 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -212,7 +212,10 @@
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
 		    "\\([-+][^@]*\\|\\)"
 		    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
-	      "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+	      "\\|" "\\(" "\\(mdw\\|mwooding\\)"
+			  "\\(\\+[^@]*\\)?"
+		    "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
+		    "\\)" "@"
 		    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
 	      "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
 	      "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
@@ -240,6 +243,7 @@
 		   (member (md5 addr)
 			   '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
 			     "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+			     "35fb1633379a1e4d4be3b139cae20111" ;work crucible spam
 			     ))
 		   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
 			(string= (md5 (match-string 2 addr))
@@ -311,8 +315,10 @@
 (setq-default truncate-partial-width-windows nil
 	      truncate-lines t)
 (setq default-indicate-empty-lines t)
-(setq whitespace-style
-      '(trailing space-before-tab space-after-tab empty indentation face))
+(setq view-read-only t)
+(setq whitespace-style '(trailing empty indentation face lines-tail
+			 space-before-tab space-after-tab)
+      whitespace-line-column 77)
 (setq woman-use-own-frame nil		;Keep man pages somewhere sensible
       woman-fill-column 72)		;Right margin position.
 (setq diff-switches "-u"		;I like reading unified diffs
@@ -662,7 +668,6 @@
 			  "\\)$")
 		 . text-mode)
 		("\\.calc?$" . apcalc-mode)
-		("/src/linux/.*\\.\\(c\\|h\\|cc\\)$" . linux-c-mode)
 		("/\\(s\\|sh\\)/" . arm-assembler-mode)
 		("\\.\\(cmd\\|exec\\|rexx\\)$" . rexx-mode)
 		("\\.st$" . smalltalk-mode)
@@ -783,7 +788,6 @@
   (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t)
   (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t)
   (add-hook 'c++-mode-hook 'mdw-fontify-c-and-c++ t)
-  (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
   (add-hook 'rust-mode-hook 'mdw-fontify-rust t)