Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: In programming modes (at least) treat `------' as a page boundary.

diff --git a/emacs b/emacs
index 5e3d2e7987e48e02737e2304b9dd4be98b4b8a9f..d1fb1412e6b13ecb4fbc056aa9be9f8fc0586339 100644 (file)
--- a/emacs
+++ b/emacs
@@ -178,6 +178,8 @@
 
 (defvar mdw-black-background t)
 
+(eval-after-load "outline" '(require 'foldout))
+
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
@@ -330,6 +332,8 @@
 (global-set-key [?\C-x ?w ?j] 'windmove-down)
 (global-set-key [?\C-x ?w right] 'windmove-right)
 (global-set-key [?\C-x ?w ?l] 'windmove-right)
+(global-set-key [?\C-x ?g ?l] 'org-store-link)
+(global-set-key [?\C-x ?g ?a] 'org-agenda)
 (global-set-key [?\C-x ?t ?i] 'timeclock-in)
 (global-set-key [?\C-x ?t ?c] 'timeclock-change)
 (global-set-key [?\C-x ?t ?o] 'timeclock-out)
@@ -361,6 +365,7 @@
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs" . csharp-mode)
+               ("\\.org$" . org-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"