X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8244840ab180822fe9c37f73e4a1137997ef6566..954f4dfc9777e3d9cb17886cb180914c31b5a0a9:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index 52a9a1c..3633219 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))
 
@@ -187,6 +196,7 @@
     (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))
@@ -432,7 +442,8 @@
 (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.
 
@@ -579,7 +590,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