From 5fd865b5379876da51894d9cd3a4f19e92bd7f3b Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 24 Apr 2016 11:40:07 +0100
Subject: [PATCH 1/1] dot/emacs: Don't do calendar/diary things if we're trying
 to start quickly.

---
 dot/emacs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dot/emacs b/dot/emacs
index 5bb61e2..b8989d7 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -122,6 +122,7 @@
 ;; Emacs server behaviour.
 
 (and (or window-system (mdw-emacs-version-p 23))
+     (not mdw-fast-startup)
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
@@ -475,7 +476,7 @@
 (display-time)
 (column-number-mode 1)
 (trap
-  (if window-system
+  (if (and window-system (not mdw-fast-startup))
       (let ((calendar-view-diary-initially-flag t))
 	(calendar))))
 
-- 
2.11.0