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 --combined dot/emacs
index faae519ba4183d4d82c2056e6973fcfbad63adb5,0d2b3f55c4667b3eac938911bd9205c759a14bc6..81db066561aca960b7845368f5023e3528875c9f
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -127,11 -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")
@@@ -359,10 -358,7 +359,7 @@@
  (setq display-time-24hr-format t)
  (display-time)
  (column-number-mode 1)
- (trap
-   (if window-system
-       (let ((view-diary-entries-initially t))
-       (calendar))))
+ (trap (if window-system (calendar)))
  
  ;;;--------------------------------------------------------------------------
  ;;; MailCrypt.