X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5d62fc5aa4d5852ca08bde434cb39f73a0a4c346..3690368c9119a35d62afd69498fa9215d8a54560:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index c0257de..afb08bd 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -21,7 +21,18 @@
 ;;; 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)
 
@@ -88,14 +99,12 @@
 
 ;; 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))
 
@@ -191,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\\)"
@@ -202,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)
@@ -213,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.
@@ -484,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)
@@ -496,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)))
@@ -542,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)