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

diff --git a/dot/emacs b/dot/emacs
index f8bd2e7..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)
@@ -212,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"
@@ -343,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))