dot/emacs: Squash away `blah+...@some.domain' suffixes for BBDB.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 54072f1..31cfd15 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -213,6 +213,8 @@
                                     "\\)")
                             addr)
               (concat "submit@bugs." (match-string 1 addr)))
+             ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
+              (concat (match-string 1 addr) (match-string 2 addr)))
              (t addr))))
 
 ;; Customization.
@@ -484,7 +486,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)
@@ -496,7 +499,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)))