dot/emacs: Don't do calendar/diary things if we're trying to start quickly.
[profile] / dot / emacs
index 52a9a1c..b8989d7 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-(setq load-path (nconc load-path (list "~/lib/emacs")))
+(let ((path "~/lib/emacs/")
+      (pkgs (list "bbdb/" "multiple-cursors/" "rust-mode/"))
+      pkg)
+  (setq load-path (nconc load-path (list path)))
+  (while (setq pkg (pop pkgs))
+    (let ((dir (concat path pkg)))
+      (if (file-exists-p dir)
+         (setq load-path (nconc load-path (list dir))))))
+  (let ((boot (concat path "mdw-pkgs.el")))
+    (if (file-exists-p boot)
+       (load boot))))
+
 (require 'dot-emacs)
 (require 'cl)
 
@@ -41,6 +52,7 @@
 (maybe-autoload 'stgit "stgit" nil t)
 (maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
 (maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
+(maybe-autoload 'org-bbdb-anniversaries "org" nil t)
 
 (and (library-exists-p "debian-changelog-mode")
      (add-to-list 'auto-mode-alist
 
 ;; Multiple cursors.
 
-(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/")))
 (global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap)
 (autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el"
   "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap)
 
 ;; Rust mode.
 
-(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/")))
 (autoload 'rust-mode "rust-mode" nil t)
 (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
 ;; Emacs server behaviour.
 
 (and (or window-system (mdw-emacs-version-p 23))
+     (not mdw-fast-startup)
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
                  edit-server-new-frame nil
                  gnuserv-frame t)
 (setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
-      mail-archive-file-name "~/Mail/sent"
+      mail-archive-file-name nil
+      message-default-mail-headers ""
+      message-default-news-headers ""
       compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-extract-address-components-func 'bbdb-extract-address-components
       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"
+             "\\|" "mark\\.wooding@trustonic\\.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)
+                  (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+                                        "@newincco\\.onmicrosoft\\.com")
+                                addr)
+                  (member (md5 addr)
+                          '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+                            "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+                            ))
+                  (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.
 (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.
 
 (display-time)
 (column-number-mode 1)
 (trap
-  (if window-system
+  (if (and window-system (not mdw-fast-startup))
       (let ((calendar-view-diary-initially-flag t))
        (calendar))))
 
 
 ;; 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)
        (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)))
   (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)
 (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