X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/162d33499592d12d7c9f44c1a66f40b073eef16b..cfabf52cc6df41857e7823994cc7433de2a66871:/emacs

diff --git a/emacs b/emacs
index 9b9ae96..0cca241 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
@@ -159,7 +169,7 @@
 (setq find-ls-option			;Build file lists efficiently
       '("-print0 | xargs -0r ls -ld" . "ld"))
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
-(setq Info-fontify-maximum-menu-size 60000)
+(setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
 (setq ispell-program-name "aspell"
       ispell-local-dictionary "en_GB-ize-w_accents"
@@ -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)
@@ -395,7 +408,7 @@
 		("\\.\\(tex\\|dtx\\)$" . latex-mode)
 		("\\.gc$" . haskell.-mode)
 		(,(concat "^" (getenv "HOME") "/News/") . mdwmail-mode)
-		(,(concat "^" tmpdir "/\\(SLRN\\|snd\\|pico\\)")
+		(,(concat "^" tmpdir "/\\(SLRN\\|snd\\|pico\\|mutt\\)")
 		 . mdwmail-mode))
 	      auto-mode-alist))
 
@@ -412,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))
 
@@ -490,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)
 
@@ -516,13 +530,12 @@
 (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)
 
 (setq LaTeX-table-label "tbl:")
-(setq-default TeX-master nil)
-;; (setq TeX-parse-self t)
-;; (setq TeX-auto-save t)
 (setq TeX-auto-untabify nil)
 (add-hook 'TeX-mode-hook 'mdw-fontify-tex t)
 (add-hook 'tex-mode-hook 'mdw-fontify-tex t)
@@ -574,6 +587,14 @@
 	("^pdf$" "." "evince %o")
 	("^html?$" "." "netscape %o")))
 
+(setq reftex-use-external-file-finders t)
+
+(setq bibtex-field-delimiters 'double-quotes
+      bibtex-entry-format '(realign opts-or-alts required-fields
+			    numerical-fields last-comma delimiters
+			    unify-case)
+      bibtex-include-OPTkey nil)
+
 ;;;----- SLIME setup --------------------------------------------------------
 
 (trap