X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/36ef07f1c95343d8bd020b9d6b115fd6930933da..e34a133fd6788a1769d624c9ac6f2c4bbf9efb65:/emacs diff --git a/emacs b/emacs index bae4138..8abc4af 100644 --- a/emacs +++ b/emacs @@ -1,7 +1,5 @@ ;;; -*- mode: emacs-lisp; coding: utf-8 -*- ;;; -;;; $Id: .emacs,v 1.11 1997/01/01 18:47:09 mdw Exp $ -;;; ;;; Emacs configuration file ;;; ;;; (c) 1996-1999 Mark Wooding @@ -39,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))) @@ -80,6 +81,15 @@ (setq backup-by-copying-when-linked t) (setq backup-by-copying-when-mismatch t) +(setq mdw-backup-disable-regexps + '("/\\.git/COMMIT_EDITMSG$" + "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$")) + +;; --- Safe variables --- + +(setq safe-local-variable-values + '((make-backup-files . nil))) + ;; --- Calculator fiddling --- (setq calc-settings-file "~/.emacs-calc") @@ -95,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 @@ -133,6 +150,8 @@ (setq dabbrev-case-replace nil) ;Retain case when completing (setq next-line-add-newlines nil) ;Don't add weird newlines (setq split-height-threshold 45) ;Reuse windows where sensible +(setq display-buffer-reuse-frames nil ;Don't confuse me by showing buffers + iswitchb-default-method 'samewindow) ;in other random frames (setq dired-deletion-confirmer ;Make deletion easier in dired (symbol-function 'y-or-n-p)) (setq dired-listing-switches "-alF") ;Do `ls -F' things in dired windows @@ -150,7 +169,8 @@ (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" flyspell-default-dictionary "en_GB-ize-w_accents" @@ -160,12 +180,21 @@ (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)) (trap (or mdw-fast-startup (global-auto-revert-mode t))) (setq psgml-html-build-new-buffer nil) +(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)) @@ -191,12 +220,22 @@ ;;;----- Calendar configuration --------------------------------------------- +(setq diary-file "~/etc/diary") + ;; --- Trivial stuff for the sunrise/sunset calculations --- (setq calendar-latitude 52.2) (setq calendar-longitude 0.1) (setq calendar-location-name "Cambridge, UK") +;; --- Holidays --- + +(and (not mdw-fast-startup) + (trap + (require 'ew-hols) + (setq other-holidays (append english-and-welsh-bank-holidays + other-holidays)))) + ;; --- Date format fiddling --- (setq european-calendar-style t) @@ -233,7 +272,7 @@ (let ((view-diary-entries-initially t)) (calendar)))) -(defvar mdw-black-background t) +;;;----- MailCrypt ---------------------------------------------------------- ;; --- Define more mode hooks for MailCrypt --- @@ -297,40 +336,44 @@ ;; --- Global keymap changes --- (trap - (windmove-default-keybindings) - (global-set-key [?\C-x ?w left] 'windmove-left) - (global-set-key [?\C-x ?w ?h] 'windmove-left) - (global-set-key [?\C-x ?w up] 'windmove-up) - (global-set-key [?\C-x ?w ?k] 'windmove-up) - (global-set-key [?\C-x ?w down] 'windmove-down) - (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) - (setq windmove-wrap-around t)) + (windmove-default-keybindings)) +(setq windmove-wrap-around t) (trap (iswitchb-mode)) +(global-set-key [?\C-x ?w left] 'windmove-left) +(global-set-key [?\C-x ?w ?h] 'windmove-left) +(global-set-key [?\C-x ?w up] 'windmove-up) +(global-set-key [?\C-x ?w ?k] 'windmove-up) +(global-set-key [?\C-x ?w down] 'windmove-down) +(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 [f4] 'query-replace-regexp) -(global-set-key [f5] 'goto-line) -(global-set-key [f6] 'auto-fill-mode) -(global-set-key [f7] 'occur) -(global-set-key [f8] 'undo) -(global-set-key [f9] 'mdw-divvy-window) +(global-set-key [?\C-x ?/] 'auto-fill-mode) +(global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) (global-set-key [insertchar] 'overwrite-mode) (global-set-key [?\C-x ?m] 'vm-mail) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) (global-set-key [delete] 'delete-char) -(global-set-key [?\C-[ ?\C-m] 'call-last-kbd-macro) (global-set-key [?\M-q] 'mdw-fill-paragraph) (global-set-key [?\C-h ?\C-m] 'manual-entry) +(global-set-key [C-M-backspace] 'backward-kill-sexp) (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) (global-set-key [vertical-scroll-bar C-down-mouse-1] 'mouse-drag-vertical-line) (global-set-key [vertical-scroll-bar C-mouse-1] #'(lambda () (interactive))) -(global-set-key [mouse-4] 'mdw-wheel-up) -(global-set-key [mouse-5] 'mdw-wheel-down) ;; --- Recognising types of files --- @@ -339,6 +382,7 @@ ("\\.m$" . objc-mode) ("\\.mxd$" . c-mode) ("\\.cs" . csharp-mode) + ("\\.org$" . org-mode) ;; ("/[ch]/" . c-mode) (,(concat "/\\(" "\\.stgit\\.msg" "\\|" @@ -381,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)) @@ -459,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) @@ -467,6 +512,9 @@ (setq-default py-indent-offset 2) (add-hook 'python-mode-hook 'mdw-fontify-python t) +(setq py-python-command-args `("-i" "-colors" ,(if mdw-black-background + "Linux" + "LightBG"))) (setq-default tcl-indent-level 2) (add-hook 'tcl-mode-hook 'mdw-fontify-tcl t) @@ -482,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) @@ -509,11 +559,6 @@ (add-hook 'lisp-interaction-mode-hook 'mdw-fontify-lispy t) (add-hook 'slime-repl-mode-hook 'mdw-fontify-lispy t) (add-hook 'lisp-mode-hook 'mdw-common-lisp-indent t) -(trap - (if (not mdw-fast-startup) - (progn - (require 'slime-autoloads) - (slime-setup '(slime-autodoc))))) (add-hook 'inferior-lisp-mode-hook #'(lambda () (local-set-key "\C-m" 'comint-send-and-indent)) t) @@ -547,6 +592,12 @@ ;;;----- SLIME setup -------------------------------------------------------- +(trap + (if (not mdw-fast-startup) + (progn + (require 'slime-autoloads) + (slime-setup '(slime-autodoc slime-c-p-c))))) + (let ((stuff '((cmucl ("cmucl")) (sbcl ("sbcl") :coding-system utf-8-unix) (clisp ("clisp") :coding-system utf-8-unix)))) @@ -562,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 --- @@ -574,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)