dot/emacs: Use newer diary hook functions if they're available.
[profile] / dot / emacs
index 2128756..37e742d 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -84,7 +84,7 @@
 
 (require 'paren)
 (trap (show-paren-mode t))
-(or window-system (menu-bar-mode -1))
+(or window-system (mdw-emacs-version-p 22) (menu-bar-mode -1))
 
 ;; Multiple cursors.
 
 (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))
+
 ;; Temporary directory handling.
 
 (defun mdw-check-dir-exists (dir)
 
 ;; 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)
 
 (or mdw-fast-startup
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
-(setq bbdb-north-american-phone-numbers-p nil)
+(setq bbdb-file "~/etc/state/bbdb"
+      bbdb-north-american-phone-numbers-p nil
+      bbdb/news-auto-create-p (lambda ()
+                               (string-match "^nnimap\\+"
+                                             gnus-newsgroup-name))
+      bbdb-user-mail-names
+      (concat "^"
+             "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
+                   "\\([-+][^@]*\\|\\)"
+                   "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
+             "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
+             "\\|" "mwooding@\\(good\\|blackberry\\)\\.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)))
+             (t addr))))
 
 ;; Customization.
 
 ;;;--------------------------------------------------------------------------
 ;;; Calendar configuration.
 
-(setq diary-file "~/etc/diary")
+(setq diary-file "~/etc/state/diary")
 
 ;; Trivial stuff for the sunrise/sunset calculations.
 
 
 ;; Date format fiddling.
 
-(setq european-calendar-style t)
+(setq european-calendar-style t
+      calendar-date-style 'european)
 
 (setq diary-date-forms '((day "[-/]" month "[^-/0-9]")
                         (day " *" monthname "[ \t]*\\(\^M\\|\n\\)")
 
 (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.
 
 (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.
 
 ;; Default frame size.
 
 (setq default-frame-alist
-      (mdw-uniquify-alist
-       `((width . ,(if (>= emacs-major-version 21) 77 78))
-        (height . 33)
-        (vertical-scroll-bars . right)
-        (cursor-type . bar)
-        (cursor-blink . t)
-        (left-fringe . 5)
-        (right-fringe . 5)
-        (scroll-bar-width . 15)
-        (cursor-color . "red")
-        (background-mode . ,(if mdw-black-background 'dark 'light)))))
-(setq window-system-default-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+       (height . 33)
+       (vertical-scroll-bars . right)
+       (cursor-type . bar)
+       (cursor-blink . t)
+       (left-fringe . 5)
+       (right-fringe . 5)
+       (scroll-bar-width . 15)
+       (tool-bar-lines . 0)
+       (menu-bar-lines . 1)
+       (cursor-color . "red")
+       (background-mode . ,(if mdw-black-background 'dark 'light)))
+      initial-frame-alist
+      `((width . ,(if (>= emacs-major-version 21) 77 78))
+       (menu-bar-lines . ,(if window-system 1 0)))
+      window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
            (menu-font . "8.Helv")
            (background-color . "lightgrey"))
 (setq windmove-wrap-around t)
 (trap (iswitchb-mode))
 (progn
-  (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 [?\e ?\e] 'mdw-wrong)
+  (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
+  (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)
                ("@BASH@" . sh-mode)
                ("@PYTHON@" . python-mode)
                ("@PERL@" . cperl-mode)
-               ("/perl" . cperl-mode)
+               ("perl" . cperl-mode)
                ("@TCLSH@" . tcl-mode)
                ("@WISH@" . tcl-mode)
-               ("/tclsh" . tcl-mode)
-               ("/wish" . tcl-mode))
+               ("tclsh" . tcl-mode)
+               ("wish" . tcl-mode))
              interpreter-mode-alist))
 
 (setq completion-ignored-extensions
        tcl-mode-hook go-mode-hook js-mode-hook javascript-mode-hook
        conf-mode-hook m4-mode-hook autoconf-mode-hook autotest-mode-hook
        a68-mode-hook a68-mode-hooks asm-mode-hook fsharp-mode-hook
-       scala-mode-hook TeX-mode-hook LaTeX-mode-hook
+       scala-mode-hook rust-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 makefile-mode-hook
   (add-hook 'linux-c-mode-hook #'(lambda () (setq c-basic-offset 8)))
   (add-hook 'asm-mode-hook 'mdw-fontify-asm t)
   (add-hook 'go-mode-hook 'mdw-fontify-go t)
+  (add-hook 'rust-mode-hook 'mdw-fontify-rust t)
 
   (add-hook 'icon-mode-hook 'mdw-fontify-icon t)