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

[profile] / emacs

diff --git a/emacs b/emacs
index ba49c51..d1fb141 100644 (file)
--- a/emacs
+++ b/emacs
@@ -160,6 +160,7 @@
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)            ;Save bookmarks automatically
 (setq Info-fontify-maximum-menu-size 60000)
+(setq set-mark-command-repeat-pop t)
 (setq ispell-program-name "aspell"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
@@ -177,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))
 
@@ -329,6 +332,14 @@
 (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)
+(global-set-key [?\C-x ?t ?r] 'timeclock-reread-log)
+(global-set-key [?\C-x ?t ?w] 'timeclock-workday-remaining-string)
+(global-set-key [?\C-x ?t ?s] 'timeclock-status-string)
 (global-set-key [?\M-#] 'calc-dispatch)
 (global-set-key [?\C-x ?/] 'auto-fill-mode)
 (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)
@@ -354,6 +365,7 @@
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs" . csharp-mode)
+               ("\\.org$" . org-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"