From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 9 May 2008 21:22:37 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/3dbf05efefb880a79fb340a591d02bcf6b47234a?hp=133cf81dabe349af05c3d2efc44910a3685e4209

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 --git a/emacs b/emacs
index 7185504..d1fb141 100644
--- a/emacs
+++ b/emacs
@@ -334,6 +334,12 @@
 (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)