From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 21 Mar 2016 11:04:21 +0000 (+0000)
Subject: dot/emacs: Pick the right master diary file.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/2fddf4aa7fdb5d69096b149ec9c48011e867ae60

dot/emacs: Pick the right master diary file.
---

diff --git a/dot/emacs b/dot/emacs
index dc3da9b..6dbbbed 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -361,7 +361,12 @@
 ;;;--------------------------------------------------------------------------
 ;;; Calendar configuration.
 
-(setq diary-file "~/etc/state/diary")
+(setq diary-file
+      (let ((main-diary "~/etc/state/diary")
+	    (private-diary "~/etc/state.private/diary.private"))
+	(if (file-exists-p private-diary)
+	    private-diary
+	  main-diary)))
 
 ;; Trivial stuff for the sunrise/sunset calculations.