summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/appt.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3703ebaba1..b645e41f5d5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29 Glenn Morris <rgm@gnu.org>
+
+ * calendar/appt.el (appt-activate): Check diary file.
+
2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org>
* pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index d0ad6464510..4926e79c2b5 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -702,6 +702,7 @@ ARG is positive, otherwise off."
(cancel-timer appt-timer)
(setq appt-timer nil))
(when appt-active
+ (diary-check-diary-file)
(add-hook 'write-file-functions 'appt-update-list)
(setq appt-timer (run-at-time t 60 'appt-check)
global-mode-string