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

[profile] / emacs

diff --git a/emacs b/emacs
index 9b9ae9665026457249c2286ce4127defd996693d..49c56496160aa670769d2f1544fd8ba88b6f15d3 100644 (file)
--- a/emacs
+++ b/emacs
@@ -37,6 +37,9 @@
 (maybe-autoload 'git-status "git" nil t)
 (maybe-autoload 'git-blame-mode "git-blame" nil t)
 (maybe-autoload 'stgit "stgit" nil t)
+(maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
+(maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
+
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
@@ -102,6 +105,13 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
+;; --- Customization ---
+
+(setq custom-file "~/.emacs-custom")
+(trap (load custom-file))
+
+(trap (load "~/.emacs-local"))
+
 ;; --- Internationalization twiddling ---
 
 (trap
@@ -170,6 +180,7 @@
   (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
   (setq uniquify-after-kill-buffer-p t))
 (transient-mark-mode t)
+(setq mark-even-if-inactive t)
 (trap
   (tooltip-mode 0)
   (tool-bar-mode 0))
@@ -344,6 +355,8 @@
 (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 [?\C-x ?t ?p] 'nc-timesheet-prepare)
+(global-set-key [?\C-x ?t ?\C-m] 'nc-timesheet-submit)
 (global-set-key [?\M-#] 'calc-dispatch)
 (global-set-key [?\C-x ?/] 'auto-fill-mode)
 (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window)