Merge remote-tracking branch 'ponder/master'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index faae519ba4183d4d82c2056e6973fcfbad63adb5..81db066561aca960b7845368f5023e3528875c9f 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -359,10 +359,7 @@
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
 (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.
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.