Mercurial > emacs

changeset 110795:45f1e8634472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minr appt.el change. * lisp/calendar/appt.el (appt-activate): Give a warning rather than an error if there is no diary-file.
author Glenn Morris <rgm@gnu.org>
date Wed, 06 Oct 2010 19:26:30 -0700
parents bacdf2d96735
children 4901ee6d9e5a
files lisp/ChangeLog lisp/calendar/appt.el
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Oct 06 19:23:28 2010 -0700
+++ b/lisp/ChangeLog	Wed Oct 06 19:26:30 2010 -0700
@@ -1,3 +1,8 @@
+2010-10-07  Glenn Morris  <rgm@gnu.org>
+
+	* calendar/appt.el (appt-activate): Give a warning rather than an error
+	if there is no diary-file.
+
 2010-10-06  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-sh.el (tramp-sh-file-name-handler-alist): Use
--- a/lisp/calendar/appt.el	Wed Oct 06 19:23:28 2010 -0700
+++ b/lisp/calendar/appt.el	Wed Oct 06 19:26:30 2010 -0700
@@ -621,17 +621,19 @@
       (setq appt-timer nil))
     (if appt-active
         (progn
-          (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
                 (append global-mode-string '(appt-mode-string)))
           (appt-check t)
-          (message "Appointment reminders enabled"))
+          (message "Appointment reminders enabled%s"
+                   ;; Someone might want to use appt-add without a diary.
+                   (if (ignore-errors (diary-check-diary-file))
+                       ""
+                     " (no diary file found)")))
       (message "Appointment reminders disabled"))))
 
 
 (provide 'appt)
 
-;; arch-tag: bf5791c4-8921-499e-a26f-772b1788d347
 ;;; appt.el ends here