Merge remote-tracking branch 'ponder/master'

* ponder/master:
  dot/emacs: Fix awful calendar snafu.
  el/dot-emacs.el: Define org-mode variables to make Docbook output work.
  dot/e16-bindings: New bindings for fiddling with window opacity.

diff --git a/dot/emacs b/dot/emacs
index 0d2b3f55c4667b3eac938911bd9205c759a14bc6..81db066561aca960b7845368f5023e3528875c9f 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -127,10 +127,11 @@
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens)
-(setq mail-signature t)
-(setq mail-yank-prefix "> ")
-(setq mail-archive-file-name "~/Mail/sent")
+(setq mail-from-style 'parens
+      mail-signature t
+      mail-yank-prefix "> "
+      mail-archive-file-name "~/Mail/sent"
+      compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")

diff --git a/dot/mailrc b/dot/mailrc
index 2c1bc1c21e0089e7e9d4822425eec6d011a05f9d..09be5e7360bbebe2bb1b56cb5dbef7d776e36cef 100644 (file)
--- a/dot/mailrc
+++ b/dot/mailrc
@@ -14,3 +14,5 @@ alias ham ham@distorted.org.uk
 alias band hibachi-dealers-members@chiark.greenend.org.uk
 alias vicky vicky@harlequin.org.uk
 alias bug submit@bugs.distorted.org.uk
+alias rejs rejs@cynic.org.uk
+alias steal "Phillip Rogaway <rogaway@cs.ucdavis.edu>" "Haibin Zhang <hbzhang@ucdavis.edu>"