X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/43026cf3f96eb213656fc373ba50080d3abe55c0..e7dfd5bb38d31918ee086aea4a18d3c97330ef99:/dot/emacs diff --git a/dot/emacs b/dot/emacs index 973690e..34146b1 100644 --- a/dot/emacs +++ b/dot/emacs @@ -21,7 +21,18 @@ ;;; along with this program; if not, write to the Free Software ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -(setq load-path (nconc load-path (list "~/lib/emacs"))) +(let ((path "~/lib/emacs/") + (pkgs (list "bbdb/" "multiple-cursors/" "rust-mode/")) + pkg) + (setq load-path (nconc load-path (list path))) + (while (setq pkg (pop pkgs)) + (let ((dir (concat path pkg))) + (if (file-exists-p dir) + (setq load-path (nconc load-path (list dir)))))) + (let ((boot (concat path "mdw-pkgs.el"))) + (if (file-exists-p boot) + (load boot)))) + (require 'dot-emacs) (require 'cl) @@ -84,18 +95,16 @@ (require 'paren) (trap (show-paren-mode t)) -(or window-system (>= emacs-major-version 22) (menu-bar-mode -1)) +(or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1)) ;; Multiple cursors. -(setq load-path (nconc load-path (list "~/lib/emacs/multiple-cursors/"))) (global-set-key [?\C-c ?r] 'mdw-multiple-cursors-keymap) (autoload 'mdw-multiple-cursors-keymap "mdw-multiple-cursors.el" "A keymap for Magnar Sveen's awesome multiple-cursors." nil 'keymap) ;; Rust mode. -(setq load-path (nconc load-path (list "~/lib/emacs/rust-mode/"))) (autoload 'rust-mode "rust-mode" nil t) (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)) @@ -111,7 +120,7 @@ ;; Emacs server behaviour. -(and (or window-system (>= emacs-major-version 23)) +(and (or window-system (mdw-emacs-version-p 23)) (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$") edit-server-new-frame nil gnuserv-frame t) @@ -149,7 +158,9 @@ (setq mail-from-style 'angles mail-signature t mail-yank-prefix "> " - mail-archive-file-name "~/Mail/sent" + mail-archive-file-name nil + message-default-mail-headers "" + message-default-news-headers "" compose-mail-user-agent-warnings nil) (setq rmail-display-summary t) @@ -185,10 +196,14 @@ (or mdw-fast-startup (trap (bbdb-initialize 'gnus 'sendmail 'message))) -(setq bbdb-north-american-phone-numbers-p nil - bbdb/news-auto-create-p (lambda () - (string-match "^nnimap\\+" - gnus-newsgroup-name)) +(setq bbdb-file "~/etc/brain/bbdb" + bbdb-north-american-phone-numbers-p nil + bbdb-extract-address-components-func 'bbdb-extract-address-components + bbdb/news-auto-create-p + (lambda () + (let ((group gnus-newsgroup-name)) + (and (string-match "^nnimap\\+" group) + (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group))))) bbdb-user-mail-names (concat "^" "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)" @@ -196,14 +211,28 @@ "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)" "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com" "\\|" "mwooding@\\(good\\|blackberry\\)\\.com" + "\\|" "mark\\.wooding@trustonic\\.com" "\\)$") bbdb-canonicalize-net-hook (lambda (addr) - (cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" - "HTML-[0-9]+-[0-9]+-[0-9]+" - "@\\(nationwide-communications\\.co\\.uk\\)") - addr) - (concat "nationwide@" (match-string 1 addr))) + (cond ((null addr) + nil) + ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_" + "HTML-[0-9]+-[0-9]+-[0-9]+" + "@\\(nationwide-communications\\." + "co\\.uk\\)$") + addr) + (string-match (concat "^[0-9]+@bugs\\." + "\\(" "debian\\.org" + "\\|" "distorted\\.org\\.uk" + "\\)$") + addr) + (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr) + (string= (md5 (match-string 2 addr)) + "879b795aed959b1a000e9f95c132b16c"))) + nil) + ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr) + (concat (match-string 1 addr) (match-string 2 addr))) (t addr)))) ;; Customization. @@ -360,7 +389,12 @@ ;;;-------------------------------------------------------------------------- ;;; Calendar configuration. -(setq diary-file "~/etc/diary") +(setq diary-file + (let ((main-diary "~/etc/brain/diary") + (index "~/etc/index.diary")) + (if (file-exists-p index) + index + main-diary))) ;; Trivial stuff for the sunrise/sunset calculations. @@ -378,23 +412,31 @@ ;; Date format fiddling. -(setq european-calendar-style t) - -(setq diary-date-forms '((day "[-/]" month "[^-/0-9]") - (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") - (backup day " *" monthname "\\W+\\<[^*0-9]") - (day "[-/]" month "[-/]" year "[^0-9]") - (day " *" monthname " *" year "[^0-9]") - (year "[-/]" month "[-/]" day "[^0-9]") - (dayname "\\W"))) +(setq european-calendar-style t + calendar-date-style 'european + calendar-time-display-form + '(24-hours ":" minutes + (if time-zone " (") time-zone (if time-zone ")"))) + +(setq diary-date-forms + '((day "[-/]" month "[^-/0-9]") + (day " *" monthname "[ \t]*\\(\^M\\|\n\\)") + (backup day " *" monthname "\\W+\\<\\([^*0-9]\\|[0-9]+[:aApP]\\)") + (day "[-/]" month "[-/]" year "[^0-9]") + (day " *" monthname " *" year "[^0-9]") + (year "[-/]" month "[-/]" day "[^0-9]") + (dayname "\\W"))) ;; Fancy diary handling. (add-hook 'diary-display-hook 'fancy-diary-display) (setq diary-list-include-blanks t) -(add-hook 'list-diary-entries-hook 'sort-diary-entries t) -(add-hook 'list-diary-entries-hook 'include-other-diary-files) -(add-hook 'mark-diary-entries-hook 'mark-included-diary-files) +(cond ((mdw-emacs-version-p 23 1) + (add-hook 'list-diary-entries-hook 'diary-include-other-diary-files) + (add-hook 'mark-diary-entries-hook 'diary-mark-included-diary-files)) + (t + (add-hook 'list-diary-entries-hook 'include-other-diary-files) + (add-hook 'mark-diary-entries-hook 'mark-included-diary-files))) ;; Appointment management. @@ -402,21 +444,30 @@ (setq appt-issue-message t) (setq appt-display-interval 3) (setq appt-message-warning-time 10) +(and (not mdw-fast-startup) + (trap (appt-activate 1))) ;; Org-mode agenda. (setq org-agenda-include-diary t - org-tags-column -77) + org-directory "~/etc/brain.local/" + org-default-notes-file (concat org-directory "local.org") + org-tags-column -77 + org-agenda-align-tags-to-column org-tags-column) ;; Cosmetic stuff. -(setq calendar-view-diary-initially-flag t - calendar-view-holidays-initially-flag t) +(setq calendar-view-diary-initially-flag nil + calendar-view-holidays-initially-flag nil + calendar-mark-diary-entries-flag t) (setq display-time-24hr-format t) (display-time) (column-number-mode 1) -(trap (if window-system (calendar))) +(trap + (if window-system + (let ((calendar-view-diary-initially-flag t)) + (calendar)))) ;;;-------------------------------------------------------------------------- ;;; MailCrypt. @@ -453,7 +504,8 @@ ;; Default frame size. -(setq default-frame-alist +(setq frame-background-mode (if mdw-black-background 'dark 'light) + default-frame-alist `((width . ,(if (>= emacs-major-version 21) 77 78)) (height . 33) (vertical-scroll-bars . right) @@ -465,7 +517,7 @@ (tool-bar-lines . 0) (menu-bar-lines . 1) (cursor-color . "red") - (background-mode . ,(if mdw-black-background 'dark 'light))) + (background-mode . ,frame-background-mode)) initial-frame-alist `((width . ,(if (>= emacs-major-version 21) 77 78)) (menu-bar-lines . ,(if window-system 1 0))) @@ -491,29 +543,27 @@ (progn (global-set-key [?\e ?\e] 'mdw-wrong) (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit) - (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 ?g ?b] 'org-iswitchb) - (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 [?\C-c ?w left] 'windmove-left) + (global-set-key [?\C-c ?w ?h] 'windmove-left) + (global-set-key [?\C-c ?w up] 'windmove-up) + (global-set-key [?\C-c ?w ?k] 'windmove-up) + (global-set-key [?\C-c ?w down] 'windmove-down) + (global-set-key [?\C-c ?w ?j] 'windmove-down) + (global-set-key [?\C-c ?w right] 'windmove-right) + (global-set-key [?\C-c ?w ?l] 'windmove-right) + (global-set-key [?\C-c ?g ?l] 'org-store-link) + (global-set-key [?\C-c ?g ?a] 'org-agenda) + (global-set-key [?\C-c ?g ?b] 'org-iswitchb) + (global-set-key [?\C-c ?t ?i] 'timeclock-in) + (global-set-key [?\C-c ?t ?c] 'timeclock-change) + (global-set-key [?\C-c ?t ?o] 'timeclock-out) + (global-set-key [?\C-c ?t ?r] 'timeclock-reread-log) + (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string) + (global-set-key [?\C-c ?t ?s] 'timeclock-status-string) (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) (global-set-key [?\M-#] 'calc-dispatch) (global-set-key [?\C-x ?/] 'auto-fill-mode) - (global-set-key [?\C-x ?w ?d] 'mdw-divvy-window) + (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window) (global-set-key [insertchar] 'overwrite-mode) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) @@ -551,7 +601,7 @@ (or mdw-fast-startup (trap (progn (org-remember-insinuate) - (global-set-key [?\C-c ?o ?r] 'org-remember)))) + (global-set-key [?\C-c ?g ?r] 'org-remember)))) ;; Minor mode listing