From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 11 Nov 2011 17:57:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'ponder/master'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/c40c5499d5082b481d7b87160d313dc2bf22f728?ds=sidebyside;hp=-c

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.
---

c40c5499d5082b481d7b87160d313dc2bf22f728
diff --combined dot/emacs
index faae519,0d2b3f5..81db066
--- a/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.