From f8faccdad41b570886600b89b2da5084dfd285f0 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 11 Nov 2011 17:52:42 +0000
Subject: [PATCH 1/1] dot/emacs: Fix awful calendar snafu.

Don't locally bind view-diary-entries-initially when showing the
calendar.  If you do, then, for some reason,
calendar-view-diary-initially-flag gets unbound, and then org-mode will
get confused and introduce a variable-alias loop.  This results in
Badness.

This bug took a little while to track down...
---
 dot/emacs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dot/emacs b/dot/emacs
index d9b1035..0d2b3f5 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -358,10 +358,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.
-- 
2.11.0