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

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: Turn on mark-even-if-inactive.
  emacs: Add Timesheet magic.
  emacs: Local configuration files.

diff --combined emacs
index 9b9ae9665026457249c2286ce4127defd996693d,578cc3c01a5fe5faf7a4fb9c8fdf1c883ea488b8..49c56496160aa670769d2f1544fd8ba88b6f15d3
--- 1/emacs
--- 2/emacs
+++ b/emacs
@@@ -37,6 -37,9 +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 +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 +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))
@@@ -178,12 -189,6 +189,12 @@@
  
  (defvar mdw-black-background t)
  
 +(eval-after-load "outline"
 +  '(progn
 +     (trap (require 'foldout))
 +     (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
 +     (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 +
  (setq cltl2-root-url (mdw-config 'cltl-url))
  (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
  
@@@ -336,14 -341,14 +347,16 @@@
  (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 [?\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)
@@@ -369,7 -374,6 +382,7 @@@
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs" . csharp-mode)
 +              ("\\.org$" . org-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"