aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-03 18:19:56 -0700
committerGlenn Morris2010-10-03 18:19:56 -0700
commitb4593555945cb23a37bde10e9de93e4cdde5cc13 (patch)
treeb2667cee449cbbdbdef741a6ea6925485ac1d287
parent8762aa1038c1cabed39b8d442cbc9337f64c1260 (diff)
downloademacs-b4593555945cb23a37bde10e9de93e4cdde5cc13.tar.gz
emacs-b4593555945cb23a37bde10e9de93e4cdde5cc13.zip
Minor appt.el changes.
* lisp/calendar/appt.el (appt-add): Ensure reminders are enabled. (appt-activate): Give status messages.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/appt.el18
2 files changed, 16 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af790a99293..21c50dbc54d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-10-04 Glenn Morris <rgm@gnu.org>
2
3 * calendar/appt.el (appt-add): Ensure reminders are enabled.
4 (appt-activate): Give status messages.
5
12010-10-03 Teodor Zlatanov <tzz@lifelogs.com> 62010-10-03 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * net/gnutls.el: Improve docs. Remove starttls and ssl emulation. 8 * net/gnutls.el: Improve docs. Remove starttls and ssl emulation.
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 7667caad336..43e8666bc31 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -446,6 +446,7 @@ sMinutes before the appointment to start warning: ")
446 (and warntime 446 (and warntime
447 (not (integerp warntime)) 447 (not (integerp warntime))
448 (error "Argument WARNTIME must be an integer, or nil")) 448 (error "Argument WARNTIME must be an integer, or nil"))
449 (or appt-timer (appt-activate))
449 (let ((time-msg (list (list (appt-convert-time time)) 450 (let ((time-msg (list (list (appt-convert-time time))
450 (concat time " " msg) t))) 451 (concat time " " msg) t)))
451 ;; It is presently non-sensical to have multiple warnings about 452 ;; It is presently non-sensical to have multiple warnings about
@@ -618,13 +619,16 @@ ARG is positive, otherwise off."
618 (when appt-timer 619 (when appt-timer
619 (cancel-timer appt-timer) 620 (cancel-timer appt-timer)
620 (setq appt-timer nil)) 621 (setq appt-timer nil))
621 (when appt-active 622 (if appt-active
622 (diary-check-diary-file) 623 (progn
623 (add-hook 'write-file-functions 'appt-update-list) 624 (diary-check-diary-file)
624 (setq appt-timer (run-at-time t 60 'appt-check) 625 (add-hook 'write-file-functions 'appt-update-list)
625 global-mode-string 626 (setq appt-timer (run-at-time t 60 'appt-check)
626 (append global-mode-string '(appt-mode-string))) 627 global-mode-string
627 (appt-check t)))) 628 (append global-mode-string '(appt-mode-string)))
629 (appt-check t)
630 (message "Appointment reminders enabled"))
631 (message "Appointment reminders disabled"))))
628 632
629 633
630(provide 'appt) 634(provide 'appt)