X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0b4dfa582cc81c9d817875e97a617178e6689e41..2ded9493dfd97cf3da9b6fab1b9362cc3fde6e40:/emacs

diff --git a/emacs b/emacs
index 50a5b7b..c5da27b 100644
--- 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))
@@ -178,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))
 
@@ -330,12 +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)
@@ -361,6 +382,7 @@
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
 		("\\.cs" . csharp-mode)
+		("\\.org$" . org-mode)
 		;; ("/[ch]/" . c-mode)
 		(,(concat "/\\("
 			  "\\.stgit\\.msg" "\\|"
@@ -403,14 +425,14 @@
 
 (mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
 	'(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
-	  perl-mode-hook cperl-mode-hook python-mode-hook awk-mode-hook
-	  tcl-mode-hook asm-mode-hook
-	  TeX-mode-hook LaTeX-mode-hook TeXinfo-mode-hook
-	  tex-mode-hook latex-mode-hook texinfo-mode-hook
-	  emacs-lisp-mode-hook scheme-mode-hook
-	  lisp-mode-hook lisp-interaction-mode-hook inferior-lisp-mode-hook
-	  slime-repl-mode-hook
-	  sml-mode-hook haskell-mode-hook
+	  csharp-mode-hook perl-mode-hook cperl-mode-hook
+	  python-mode-hook awk-mode-hook tcl-mode-hook
+	  asm-mode-hook TeX-mode-hook LaTeX-mode-hook
+	  TeXinfo-mode-hook tex-mode-hook latex-mode-hook
+	  texinfo-mode-hook emacs-lisp-mode-hook scheme-mode-hook
+	  lisp-mode-hook lisp-interaction-mode-hook
+	  inferior-lisp-mode-hook slime-repl-mode-hook
+	  sml-mode-hook haskell-mode-hook erlang-mode-hook
 	  smalltalk-mode-hook rexx-mode-hook
 	  arm-assembler-mode-hook))
 
@@ -481,6 +503,7 @@
 (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
 (add-hook 'java-mode-hook 'mdw-fontify-java t)
+(add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
 
 (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
 
@@ -507,6 +530,8 @@
 (add-hook 'haskell-mode-hook 'mdw-fontify-haskell t)
 (setq-default haskell-indent-offset 2)
 
+(add-hook 'erlang-mode-hook 'mdw-fontify-erlang t)
+
 (add-hook 'texinfo-mode-hook 'mdw-fontify-texinfo t)
 (add-hook 'TeXinfo-mode-hook 'mdw-fontify-texinfo t)
 
@@ -588,6 +613,14 @@
 	      (cons head slime-lisp-implementations))))))
 (setq slime-default-lisp 'sbcl)
 
+;;;----- Blogging -----------------------------------------------------------
+
+(setq weblogger-config-alist
+      '(("vox"
+	 ("user" . "mdw")
+	 ("server-url" . "http://vox.distorted.org.uk/admin/mt-xmlrpc.cgi")
+	 ("weblog" . "1"))))
+
 ;;;----- Shell mode ---------------------------------------------------------
 
 ;; --- Make the shell mode aware of my prompt ---
@@ -600,6 +633,7 @@
 ;; --- Notice passwords, and make C-a work right ---
 
 (add-hook 'shell-mode-hook #'mdw-sh-mode-setup)
+(setq shell-font-lock-keywords nil)
 
 (add-hook 'term-mode-hook #'mdw-term-mode-setup)