dot/emacs: Better grip on when `M-x calendar' shows things.

Don't show the diary by default usually, but do at startup.  Don't show
holidays at all.

diff --git a/dot/emacs b/dot/emacs
index 8ceafeac133272062ea3bf3ad629b076ec20543b..52a9a1ce5354f619a7e193a0a995e40ef5ab32c9 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -436,13 +436,17 @@
 
 ;; Cosmetic stuff.
 
-(setq calendar-view-diary-initially-flag t
-      calendar-view-holidays-initially-flag t)
+(setq calendar-view-diary-initially-flag nil
+      calendar-view-holidays-initially-flag nil
+      calendar-mark-diary-entries-flag t)
 
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap (if window-system (calendar)))
+(trap
+  (if window-system
+      (let ((calendar-view-diary-initially-flag t))
+       (calendar))))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.