dot/emacs: Don't do calendar/diary things if we're trying to start quickly.

diff --git a/dot/emacs b/dot/emacs
index 5bb61e2703c5696b3691640f86ea80ef86b4df51..b8989d7765f442b60a615104663b0051c8c11731 100644 (file)
--- 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))))