X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/6f6c364942a7bb9c46feb38dc4bdc86d67dc9395..a55efa66671e704cd3e69cb3ef5f65665d0e6caa:/dot/emacs?ds=inline

diff --git a/dot/emacs b/dot/emacs
index 40280de..562d733 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -199,29 +199,38 @@
       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"
 	      "\\)$")
       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)
+		   (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))))
 
 ;; Customization.
@@ -493,7 +502,8 @@
 
 ;; Default frame size.
 
-(setq default-frame-alist
+(setq frame-background-mode (if mdw-black-background 'dark 'light)
+      default-frame-alist
       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	(height . 33)
 	(vertical-scroll-bars . right)
@@ -505,7 +515,7 @@
 	(tool-bar-lines . 0)
 	(menu-bar-lines . 1)
 	(cursor-color . "red")
-	(background-mode . ,(if mdw-black-background 'dark 'light)))
+	(background-mode . ,frame-background-mode))
       initial-frame-alist
       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	(menu-bar-lines . ,(if window-system 1 0)))
@@ -551,7 +561,7 @@
   (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
-  (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
+  (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
   (global-set-key [insertchar] 'overwrite-mode)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)