diff options
| author | Glenn Morris | 2010-09-28 20:54:03 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-09-28 20:54:03 -0700 |
| commit | c2828614add492327092a24cc5ec15ff84b4b8ee (patch) | |
| tree | f3d41b3d6b20b79aaba1da4bc04f329c84e0d59f | |
| parent | 0c43b6f8d5d1458b51dc144efca682c811ebfc44 (diff) | |
| download | emacs-c2828614add492327092a24cc5ec15ff84b4b8ee.tar.gz emacs-c2828614add492327092a24cc5ec15ff84b4b8ee.zip | |
* lisp/calendar/appt.el (appt-activate): Check diary file.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/calendar/appt.el | 1 |
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 @@ | |||
| 1 | 2010-09-29 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calendar/appt.el (appt-activate): Check diary file. | ||
| 4 | |||
| 1 | 2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org> | 5 | 2010-09-29 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 6 | ||
| 3 | * pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else | 7 | * 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." | |||
| 702 | (cancel-timer appt-timer) | 702 | (cancel-timer appt-timer) |
| 703 | (setq appt-timer nil)) | 703 | (setq appt-timer nil)) |
| 704 | (when appt-active | 704 | (when appt-active |
| 705 | (diary-check-diary-file) | ||
| 705 | (add-hook 'write-file-functions 'appt-update-list) | 706 | (add-hook 'write-file-functions 'appt-update-list) |
| 706 | (setq appt-timer (run-at-time t 60 'appt-check) | 707 | (setq appt-timer (run-at-time t 60 'appt-check) |
| 707 | global-mode-string | 708 | global-mode-string |