dot/emacs: Load `cl' before `dot-emacs.el'.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f6290cc..2db3e63 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -33,8 +33,8 @@
     (if (file-exists-p boot)
        (load boot))))
 
-(require 'dot-emacs)
 (require 'cl)
+(require 'dot-emacs)
 
 ;;;--------------------------------------------------------------------------
 ;;; Some random initialisation.
@@ -212,7 +212,10 @@
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
                    "\\([-+][^@]*\\|\\)"
                    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
-             "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+             "\\|" "\\(" "\\(mdw\\|mwooding\\)"
+                         "\\(\\+[^@]*\\)?"
+                   "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
+                   "\\)" "@"
                    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
              "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
@@ -240,6 +243,7 @@
                   (member (md5 addr)
                           '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
                             "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
+                            "35fb1633379a1e4d4be3b139cae20111" ;work crucible spam
                             ))
                   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
                        (string= (md5 (match-string 2 addr))
@@ -312,8 +316,9 @@
              truncate-lines t)
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
-(setq whitespace-style
-      '(trailing space-before-tab space-after-tab empty indentation face))
+(setq whitespace-style '(trailing empty indentation face lines-tail
+                        space-before-tab space-after-tab)
+      whitespace-line-column 77)
 (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