chiark
/
gitweb
/
~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/emacs: Pick the right master diary file.
[profile]
/
dot
/
emacs
diff --git
a/dot/emacs
b/dot/emacs
index dc3da9b9a4b5fae3e018c2a4ec23f8cde3a611c7..6dbbbed49f23f76c5c3ef5d8c68b7e96efad620a 100644
(file)
--- a/
dot/emacs
+++ b/
dot/emacs
@@
-361,7
+361,12
@@
;;;--------------------------------------------------------------------------
;;; Calendar configuration.
;;;--------------------------------------------------------------------------
;;; 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.
;; Trivial stuff for the sunrise/sunset calculations.