[Emacs-diffs] /srv/bzr/emacs/trunk r101823: Minr appt.el change.

[Glenn Morris]

------------------------------------------------------------
revno: 101823
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-10-06 19:26:30 -0700
message:
  Minr appt.el change.
  * lisp/calendar/appt.el (appt-activate): Give a warning rather than an error
  if there is no diary-file.
modified:
  lisp/ChangeLog
  lisp/calendar/appt.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-06 12:03:29 +0000
+++ b/lisp/ChangeLog    2010-10-07 02:26:30 +0000
@@ -1,3 +1,8 @@
+2010-10-07  Glenn Morris  <address@hidden>
+
+       * calendar/appt.el (appt-activate): Give a warning rather than an error
+       if there is no diary-file.
+
 2010-10-06  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-sh-file-name-handler-alist): Use

=== modified file 'lisp/calendar/appt.el'
--- a/lisp/calendar/appt.el     2010-10-04 01:19:56 +0000
+++ b/lisp/calendar/appt.el     2010-10-07 02:26:30 +0000
@@ -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