dot/emacs (bbdb-canonicalize-net-hook): Handle `nil' address.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 40280de..afb08bd 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -200,7 +200,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\\)"
@@ -211,7 +211,9 @@
              "\\)$")
       bbdb-canonicalize-net-hook
       (lambda (addr)
-       (cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+       (cond ((null addr)
+              nil)
+             ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
                                     "HTML-[0-9]+-[0-9]+-[0-9]+"
                                     "@\\(nationwide-communications\\.co\\.uk\\)")
                             addr)
@@ -222,6 +224,8 @@
                                     "\\)")
                             addr)
               (concat "submit@bugs." (match-string 1 addr)))
+             ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
+              (concat (match-string 1 addr) (match-string 2 addr)))
              (t addr))))
 
 ;; Customization.
@@ -493,7 +497,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 +510,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 +556,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)