X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/73abf7e40652a21cc9ce7b3545a69da8a7605f93..575fa442730280b2897d58b19fea9fdd64501600:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 7e66c2a..9bb23b2 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -33,8 +33,8 @@
     (if (file-exists-p boot)
 	(load boot))))
 
-(require 'dot-emacs)
 (require 'cl)
+(require 'dot-emacs)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
@@ -172,6 +172,8 @@
       send-mail-function 'sendmail-send-it
       mail-interactive t
       sendmail-error-reporting-interactive '("-odb" "-oee"))
+(autoload 'sendmail-send-it "sendmail")
+(autoload 'smtpmail-send-it "smtpmail")
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
@@ -200,6 +202,7 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
       bbdb/news-auto-create-p
       (lambda ()
@@ -211,7 +214,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"
@@ -221,7 +227,9 @@
       (lambda (addr)
 	(cond ((null addr)
 	       nil)
-	      ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+	      ((or (string-match "^mailer-daemon@" addr)
+		   (string-match "\.invalid$" addr)
+		   (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
 					 "HTML-[0-9]+-[0-9]+-[0-9]+"
 					 "@\\(nationwide-communications\\."
 					 "co\\.uk\\)$")
@@ -237,6 +245,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))
@@ -308,8 +317,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
@@ -337,7 +348,10 @@
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
   (setq uniquify-after-kill-buffer-p t))
 (transient-mark-mode t)
-(setq mark-even-if-inactive t)
+(setq mark-even-if-inactive t
+      shift-select-mode nil
+      delete-active-region nil
+      delete-selection-mode nil)
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))
@@ -659,7 +673,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)
@@ -780,7 +793,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)