X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/2d14c35371483621691ade4d71d16e3ea5e82a9b..e6a7e588f9a3abdcdb6cb031dc56ca7795814c50:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 31cfd15..5bb61e2 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -21,7 +21,18 @@
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-(setq load-path (nconc load-path (list "~/lib/emacs")))
+(let ((path "~/lib/emacs/")
+      (pkgs (list "bbdb/" "multiple-cursors/" "rust-mode/"))
+      pkg)
+  (setq load-path (nconc load-path (list path)))
+  (while (setq pkg (pop pkgs))
+    (let ((dir (concat path pkg)))
+      (if (file-exists-p dir)
+	  (setq load-path (nconc load-path (list dir))))))
+  (let ((boot (concat path "mdw-pkgs.el")))
+    (if (file-exists-p boot)
+	(load boot))))
+
 (require 'dot-emacs)
 (require 'cl)
 
@@ -41,6 +52,7 @@
 (maybe-autoload 'stgit "stgit" nil t)
 (maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
 (maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
+(maybe-autoload 'org-bbdb-anniversaries "org" nil t)
 
 (and (library-exists-p "debian-changelog-mode")
      (add-to-list 'auto-mode-alist
@@ -88,14 +100,12 @@
 
 ;; Multiple cursors.
 
-(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/")))
 (global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap)
 (autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
   "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
 
 ;; Rust mode.
 
-(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/")))
 (autoload 'rust-mode "rust-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
@@ -149,7 +159,9 @@
 (setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
-      mail-archive-file-name "~/Mail/sent"
+      mail-archive-file-name nil
+      message-default-mail-headers ""
+      message-default-news-headers ""
       compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
@@ -187,32 +199,48 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-extract-address-components-func 'bbdb-extract-address-components
       bbdb/news-auto-create-p
       (lambda ()
 	(let ((group gnus-newsgroup-name))
-	  (and (string-match "^nnimap\\+" group)
-	       (not (string-match ":\\(crap\\|spam\\)\\." group)))))
+	  (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
+	       (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
       bbdb-user-mail-names
       (concat "^"
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
 		    "\\([-+][^@]*\\|\\)"
 		    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
+	      "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+		    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
 	      "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
 	      "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
+	      "\\|" "mark\\.wooding@trustonic\\.com"
 	      "\\)$")
       bbdb-canonicalize-net-hook
       (lambda (addr)
-	(cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
-				     "HTML-[0-9]+-[0-9]+-[0-9]+"
-				     "@\\(nationwide-communications\\.co\\.uk\\)")
-			     addr)
-	       (concat "nationwide@" (match-string 1 addr)))
-	      ((string-match (concat "^[0-9]+@bugs\\."
-				     "\\(" "debian\\.org"
-				     "\\|" "distorted\\.org\\.uk"
-				     "\\)")
-			     addr)
-	       (concat "submit@bugs." (match-string 1 addr)))
+	(cond ((null addr)
+	       nil)
+	      ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+					 "HTML-[0-9]+-[0-9]+-[0-9]+"
+					 "@\\(nationwide-communications\\."
+					 "co\\.uk\\)$")
+				 addr)
+		   (string-match (concat "^[0-9]+@bugs\\."
+					 "\\(" "debian\\.org"
+					 "\\|" "distorted\\.org\\.uk"
+					 "\\)$")
+				 addr)
+		   (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+					 "@newincco\\.onmicrosoft\\.com")
+				 addr)
+		   (member (md5 addr)
+			   '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+			     "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+			     ))
+		   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
+			(string= (md5 (match-string 2 addr))
+				 "879b795aed959b1a000e9f95c132b16c")))
+	       nil)
 	      ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
 	       (concat (match-string 1 addr) (match-string 2 addr)))
 	      (t addr))))