dot/emacs: Arrange for Org mode to autoload for diary's benefit.
[profile] / dot / emacs
index 81db066..f71b9a2 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
 ;;; 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)
 
 (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)
+(maybe-autoload 'org-bbdb-anniversaries "org" nil t)
 
 (and (library-exists-p "debian-changelog-mode")
      (add-to-list 'auto-mode-alist
                  `(,(concat "/debian/"
                               "\\("
-                                "[" "[:lower:][:digit:]]"
-                                    "[[:lower:][:digit:].+-" "]+"
+                                "[" "[:lower:]" "[:digit:]" "]"
+                                "[" "[:lower:]" "[:digit:]" ".+-" "]+"
                                 "\\."
                               "\\)?"
                               "changelog\\'")
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
+(setq magit-log-cutoff-length 512)
+(defun mdw-magit-try-load-config-extensions ()
+  (trap (magit-load-config-extensions)))
+(add-hook 'magit-mode-hook 'mdw-magit-try-load-config-extensions)
+
 (trap (or mdw-fast-startup (require 'p4)))
 
 (trap (or mdw-fast-startup (require 'tex-site)))
 
 (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.
+
+(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.
+
+(autoload 'rust-mode "rust-mode" nil t)
+(add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
 
 ;; Temporary directory handling.
 
 
 ;; 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)
 
 (setq mdw-backup-disable-regexps
       '("/\\.git/COMMIT_EDITMSG$"
-       "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
+       "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"
+       "^/tmp/" "^/var/tmp/"))
 
 ;; Safe variables.
 
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens
+(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)
 (setq rmail-file-name "~/Mail/rmail")
 
-(setq sendmail-program "~/bin/sendmail-hack")
+(setq sendmail-program "~/bin/sendmail-hack"
+      send-mail-function 'sendmail-send-it
+      mail-interactive t
+      sendmail-error-reporting-interactive '("-odb" "-oee"))
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
+      message-interactive t
+      message-sendmail-extra-arguments '("-odb" "-oee")
+      message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
                                         mdw-trim-spaces-after-citing))
 
 
 (or mdw-fast-startup
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
-(setq bbdb-north-american-phone-numbers-p nil)
+(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\\)"
+                   "\\([-+][^@]*\\|\\)"
+                   "@\\(\\(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 ((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)
+                  (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+                                        "@newincco\\.onmicrosoft\\.com")
+                                addr)
+                  (member (md5 addr)
+                          '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+                            ))
+                  (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.
 
 (setq dabbrev-case-replace nil)                ;Retain case when completing
 (setq linum-format "%7d ")
 (setq next-line-add-newlines nil)      ;Don't add weird newlines
-(setq split-height-threshold 45)       ;Reuse windows where sensible
+(setq split-height-threshold nil)      ;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
 (setq scroll-step 5)                   ;Don't scroll too much at a time
 (setq-default fill-column 77)          ;I use rather narrow windows
 (setq-default comment-column 40)       ;Set a standard comment column
-(setq-default truncate-partial-width-windows nil)
+(setq-default truncate-partial-width-windows nil
+             truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq whitespace-style
-      '(trailing space-before-tab space-after-tab empty indentation))
+      '(trailing space-before-tab space-after-tab empty indentation face))
 (setq woman-use-own-frame nil          ;Keep man pages somewhere sensible
       woman-fill-column 72)            ;Right margin position.
 (setq diff-switches "-u"               ;I like reading unified diffs
      (define-key outline-mode-prefix-map [?\C-r] 'reveal-mode)
      (define-key outline-mode-prefix-map [?\C--] 'mdw-outline-collapse-all)))
 
+(setq imenu-auto-rescan t
+      imenu-auto-rescan-maxout (* 128 1024)
+      imenu-max-items 60)
+
 (setq cltl2-root-url (mdw-config 'cltl-url))
 (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
 
+(setq rfcview-rfc-location-pattern
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc%s.txt"
+      rfcview-std-location-pattern
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/std/std%s.txt"
+      rfcview-index-location
+      "/ftp@mirror.distorted.org.uk:/pub/mirrors/rfc/rfc-index.txt")
+
 ;;;--------------------------------------------------------------------------
 ;;; W3 and URL fetching stuff.
 
 
 (setq browse-url-browser-function (mdw-good-url-browser)
       browse-url-generic-program "mdw-chrome"
-      browse-url-mozilla-program "firefox")
+      browse-url-mozilla-program "mdw-iceweasel")
 
-(setq w3m-default-display-inline-images t)
+(setq w3m-default-display-inline-images t
+      w3m-use-cookies t)
 
 (eval-after-load "w3m"
   '(let ((entries '(("application/pdf" "\\.pdf\\'" ("evince" file) nil)
 ;;;--------------------------------------------------------------------------
 ;;; 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.
 
 
 ;; 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.
 
 (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.
 
 ;; Default frame size.
 
-(setq default-frame-alist
-      (mdw-uniquify-alist
-       '((width . 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"))
-       (if mdw-black-background
-          '((background-mode . dark))
-        '((background-mode . light)))))
-(setq window-system-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)
+       (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 . ,frame-background-mode))
+      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"))
+       (w32 (font . "fixed613 10")
+            (background-color . "black")
+            (foreground-color . "white"))
        (nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
 (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)
-  (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)
                  'mouse-drag-vertical-line)
   (global-set-key [vertical-scroll-bar C-mouse-1]
                  #'(lambda () (interactive)))
+  (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
+  (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-/] 'hippie-expand)))
 
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])
         (define-key dired-mode-map [?\C-x ?\C-q]
           'wdired-change-to-wdired-mode))
+     (trap (require 'dired-x))
      (and (fboundp 'dired-do-relsymlink)
          (define-key dired-mode-map [?\C-c ?\C-s] 'dired-do-relsymlink))))
 
 (add-hook 'org-agenda-mode-hook
          #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 (or mdw-fast-startup
-    (progn
-      (org-remember-insinuate)
-      (global-set-key [?\C-c ?r] 'org-remember)))
+    (trap (progn
+           (org-remember-insinuate)
+           (global-set-key [?\C-c ?g ?r] 'org-remember))))
 
 ;; Minor mode listing
 
 ;; Recognising types of files.
 
 (setq auto-mode-alist
-      (append `(("\\.p[lm]$" . perl-mode)
+      (append `(("\\.p[lm]$" . cperl-mode)
                ("\\.m$" . objc-mode)
                ("\\.mxd$" . c-mode)
                ("\\.cs$" . csharp-mode)
                ("\\.go$" . go-mode)
                ("\\.org$" . org-mode)
+               ("\\.make$" . makefile-mode)
+               ("\\.mk?d$" . markdown-mode)
                ;; ("/[ch]/" . c-mode)
                (,(concat "/\\("
                          "\\.stgit\\.msg" "\\|"
+                         "\\.topmsg" "\\|"
                          "\\.git/COMMIT_EDITMSG" "\\|"
                          "svn-commit\\.tmp" "\\|"
                          "svk-commit[^/.]*\\.tmp"
              auto-mode-alist))
 
 (setq interpreter-mode-alist
-      (append `(("runlisp" . lisp-mode))
+      (append `(("runlisp" . lisp-mode)
+               ("@BASH@" . sh-mode)
+               ("@PYTHON@" . python-mode)
+               ("@PERL@" . cperl-mode)
+               ("perl" . cperl-mode)
+               ("@TCLSH@" . tcl-mode)
+               ("@WISH@" . tcl-mode)
+               ("tclsh" . tcl-mode)
+               ("wish" . tcl-mode))
              interpreter-mode-alist))
 
 (setq completion-ignored-extensions
 
 (make-variable-buffer-local 'mdw-auto-indent)
 
-(mapcar (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
-       '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
-         csharp-mode-hook perl-mode-hook cperl-mode-hook
-         python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
-         tcl-mode-hook go-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))
+(mapc (lambda (hook) (add-hook hook 'mdw-misc-mode-config))
+      '(c-mode-hook c++-mode-hook objc-mode-hook java-mode-hook
+       csharp-mode-hook perl-mode-hook cperl-mode-hook dylan-mode-hook
+       python-mode-hook pyrec-mode-hook icon-mode-hook awk-mode-hook
+       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 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
+       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))
 
 (global-font-lock-mode t)
-(defalias 'perl-mode 'cperl-mode)
 
 ;;;--------------------------------------------------------------------------
 ;;; Rootly editingness.
   (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)
 
   (add-hook 'apcalc-mode-hook 'mdw-fontify-apcalc t)
 
   (add-hook 'java-mode-hook 'mdw-fontify-java t)
+  (add-hook 'scala-mode-hook 'mdw-fontify-scala t)
+  (add-hook 'js-mode-hook 'mdw-fontify-javascript t)
   (add-hook 'csharp-mode-hook 'mdw-fontify-csharp t)
+  (add-hook 'fsharp-mode-hook 'mdw-fontify-fsharp t)
+  (add-hook 'inferior-fsharp-mode-hooks 'mdw-fontify-inferior-fsharp t)
 
   (add-hook 'awk-mode-hook 'mdw-fontify-awk t)
 
 
 (progn
   (setq-default py-indent-offset 2
+               python-indent 2
                py-python-command-args
                `("-i" "-colors" ,(if mdw-black-background
                                      "Linux" "LightBG")))
 
 (add-hook 'sh-mode-hook #'mdw-setup-sh-script-mode)
 (add-hook 'autoconf-mode-hook #'mdw-setup-m4)
+(add-hook 'autotest-mode-hook #'mdw-setup-m4)
 (add-hook 'm4-mode-hook #'mdw-setup-m4)
 
 (add-hook 'smalltalk-mode-hook 'mdw-fontify-smalltalk t)
 (add-hook 'smalltalk-mode-hook 'mdw-setup-smalltalk t)
 
+(add-hook 'a68-mode-hook 'mdw-fontify-algol-68 t)
+(add-hook 'a68-mode-hooks 'mdw-fontify-algol-68 t)
+(add-hook 'dylan-mode-hook 'mdw-fontify-dylan t)
+
 (progn
   (add-hook 'emacs-lisp-mode-hook 'mdw-fontify-lispy t)
   (add-hook 'scheme-mode-hook 'mdw-fontify-lispy t)
        ("^pdf$" "." "evince %o")
        ("^html?$" "." "netscape %o")))
 
+(setq TeX-view-program-selection
+      '(((output-dvi style-pstricks) "dvips and gv")
+       (output-dvi "xdvi")
+       (output-pdf "Evince")
+       (output-html "xdg-open")))
+
 (setq TeX-open-quote "\""
       TeX-close-quote "\"")
 
        ("definition" ?D "def:" "~\\ref{%s}" t ("definitions?" "def\\.") -2)
        ("proposition" ?P "prop:" "~\\ref{%s}" t
         ("propositions?" "prop\\.") -2)
-       ("lemma" ?P "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
+       ("lemma" ?L "lem:" "~\\ref{%s}" t ("lemmas?" "lem\\.") -2)
        ("example" ?X "eg:" "~\\ref{%s}" t ("examples?") -2)
        ("exercise" ?E "ex:" "~\\ref{%s}" t ("exercises?" "ex\\.") -2)
        ("enumerate" ?i "i:" "~\\ref{%s}" item ("items?"))))