Minr appt.el change.

* lisp/calendar/appt.el (appt-activate): Give a warning rather than an error
if there is no diary-file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f83e4bf1a3eea48617bee43c2c235ac66cf7d19..2ec81e5a48d3b8fd5b55da0ea4c617adf8eb99fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 43e8666bc31b07cd08c08ae513b537fbb299f7ce..d6f4f9862d60039170478d9704693ac161fc6a14 100644 (file)
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -621,17 +621,19 @@ ARG is positive, otherwise off."
       (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