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

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Add key bindings for timeclock functions.

Conflicts:

	emacs: two independent lots of keybindings in the same place

diff --combined emacs
index 7185504,5e3d2e7..d1fb141
--- 1/emacs
--- 2/emacs
+++ b/emacs
@@@ -178,8 -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))
  
@@@ -332,8 -330,12 +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)
@@@ -359,7 -361,6 +365,7 @@@
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs" . csharp-mode)
 +              ("\\.org$" . org-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"