X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/d54a4cf35d90fe372d5b192ccd93bbd65ff4f25f..b76d1b814f813f9d5e692e002b1c8f644b79bc14:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 48053fe..c32d836 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -201,7 +201,7 @@
       (lambda ()
 	(let ((group gnus-newsgroup-name))
 	  (and (string-match "^nnimap\\+" group)
-	       (not (string-match ":\\(crap\\|spam\\)\\." group)))))
+	       (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
       bbdb-user-mail-names
       (concat "^"
 	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
@@ -213,17 +213,24 @@
 	      "\\)$")
       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.
@@ -495,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)
@@ -507,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)))
@@ -553,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)