comparison lisp/calendar/appt.el @ 110377:6dcf9897d91a

merge trunk

110376:cc92458a9829

;;
;; Today's appointment list is initialized from the diary when this
;; package is activated.  Additionally, the appointments list is
;; recreated automatically at 12:01am for those who do not logout
;; every day or are programming late.  It is also updated when the
;; `diary-file' is saved.  Calling `appt-check' with an argument (or
;; re-enabling the package) forces a re-initialization at any time.
;;
;; In order to add or delete items from today's list, without
;; changing the diary file, use `appt-add' and `appt-delete'.
;;

(defun appt-check (&optional force)
  "Check for an appointment and update any reminder display.
If optional argument FORCE is non-nil, reparse the diary file for
appointments.  Otherwise the diary file is only parsed once per day,
and when saved.

Note: the time must be the first thing in the line in the diary
for a warning to be issued.  The format of the time can be either
24 hour or am/pm.  For example:

                         (d-buff (find-buffer-visiting diary-file))
                         (selective
                          (if d-buff    ; diary buffer exists
                              (with-current-buffer d-buff
                                diary-selective-display))))
                    (diary)
                    ;; If the diary buffer existed before this command,
                    ;; restore its display state.  Otherwise, kill it.
                    (if d-buff
                        ;; Displays the diary buffer.

    ;; Convert the actual time into minutes.
    (+ (* hr 60) min)))

(defun appt-update-list ()
  "If the current buffer is visiting the diary, update appointments.
This function is intended for use with `write-file-functions'."
  (and (string-equal buffer-file-name (expand-file-name diary-file))
       appt-timer
       (let ((appt-display-diary nil))
         (appt-check t)))
  nil)

110377:6dcf9897d91a

;;
;; Today's appointment list is initialized from the diary when this
;; package is activated.  Additionally, the appointments list is
;; recreated automatically at 12:01am for those who do not logout
;; every day or are programming late.  It is also updated when the
;; `diary-file' (or a file it includes) is saved.  Calling
;; `appt-check' with an argument (or re-enabling the package) forces a
;; re-initialization at any time.
;;
;; In order to add or delete items from today's list, without
;; changing the diary file, use `appt-add' and `appt-delete'.
;;

(defun appt-check (&optional force)
  "Check for an appointment and update any reminder display.
If optional argument FORCE is non-nil, reparse the diary file for
appointments.  Otherwise the diary file is only parsed once per day,
or when it (or a file it includes) is saved.

Note: the time must be the first thing in the line in the diary
for a warning to be issued.  The format of the time can be either
24 hour or am/pm.  For example:

                         (d-buff (find-buffer-visiting diary-file))
                         (selective
                          (if d-buff    ; diary buffer exists
                              (with-current-buffer d-buff
                                diary-selective-display))))
                    ;; FIXME why not using diary-list-entries with
                    ;; non-nil LIST-ONLY?
                    (diary)
                    ;; If the diary buffer existed before this command,
                    ;; restore its display state.  Otherwise, kill it.
                    (if d-buff
                        ;; Displays the diary buffer.

    ;; Convert the actual time into minutes.
    (+ (* hr 60) min)))

(defun appt-update-list ()
  "If the current buffer is visiting the diary, update appointments.
This function also acts on any file listed in `diary-included-files'.
It is intended for use with `write-file-functions'."
  (and (member buffer-file-name (append diary-included-files
                                        (list (expand-file-name diary-file))))
       appt-timer
       (let ((appt-display-diary nil))
         (appt-check t)))
  nil)