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

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 8ceafea..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.
@@ -432,17 +434,22 @@
 (setq org-agenda-include-diary t
       org-directory "~/etc/brain.local/"
       org-default-notes-file (concat org-directory "local.org")
-      org-tags-column -77)
+      org-tags-column -77
+      org-agenda-align-tags-to-column org-tags-column)
 
 ;; Cosmetic stuff.
 
-(setq calendar-view-diary-initially-flag t
-      calendar-view-holidays-initially-flag t)
+(setq calendar-view-diary-initially-flag nil
+      calendar-view-holidays-initially-flag nil
+      calendar-mark-diary-entries-flag t)
 
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap (if window-system (calendar)))
+(trap
+  (if window-system
+      (let ((calendar-view-diary-initially-flag t))
+       (calendar))))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.
@@ -479,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)
@@ -491,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)))
@@ -537,7 +545,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)
@@ -575,7 +583,7 @@
 (or mdw-fast-startup
     (trap (progn
            (org-remember-insinuate)
-           (global-set-key [?\C-c ?o ?r] 'org-remember))))
+           (global-set-key [?\C-c ?g ?r] 'org-remember))))
 
 ;; Minor mode listing