[Emacs-diffs] Changes to emacs/lisp/calendar/appt.el

[Richard M . Stallman]

Index: emacs/lisp/calendar/appt.el
diff -c emacs/lisp/calendar/appt.el:1.55 emacs/lisp/calendar/appt.el:1.56
*** emacs/lisp/calendar/appt.el:1.55    Wed Feb  9 15:50:40 2005
--- emacs/lisp/calendar/appt.el Wed Feb 23 21:05:51 2005
***************
*** 189,197 ****
  Use `appt-add' and `appt-delete' to add and delete appointments.
  The original list is generated from today's `diary-entries-list', and
  can be regenerated using the function `appt-check'.
! Each element of the generated list has the form (MINUTES) STRING; where
  MINUTES is the time in minutes of the appointment after midnight, and
! STRING is the description of the appointment.")
  
  (defconst appt-max-time 1439
    "11:59pm in minutes - number of minutes in a day minus 1.")
--- 189,199 ----
  Use `appt-add' and `appt-delete' to add and delete appointments.
  The original list is generated from today's `diary-entries-list', and
  can be regenerated using the function `appt-check'.
! Each element of the generated list has the form (MINUTES STRING [FLAG]); where
  MINUTES is the time in minutes of the appointment after midnight, and
! STRING is the description of the appointment.
! FLAG, if non-nil, says that the element was made with `appt-add'
! so calling `appt-make-list' again should preserve it.")
  
  (defconst appt-max-time 1439
    "11:59pm in minutes - number of minutes in a day minus 1.")
***************
*** 493,499 ****
      (error "Unacceptable time-string"))
    (let* ((appt-time-string (concat new-appt-time " " new-appt-msg))
           (appt-time (list (appt-convert-time new-appt-time)))
!          (time-msg (cons appt-time (list appt-time-string))))
      (setq appt-time-msg-list (nconc appt-time-msg-list (list time-msg)))
      (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))))
  
--- 495,501 ----
      (error "Unacceptable time-string"))
    (let* ((appt-time-string (concat new-appt-time " " new-appt-msg))
           (appt-time (list (appt-convert-time new-appt-time)))
!          (time-msg (list appt-time appt-time-string t)))
      (setq appt-time-msg-list (nconc appt-time-msg-list (list time-msg)))
      (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))))
  
***************
*** 525,536 ****
                   (defvar diary-entries-list))
  ;;;###autoload
  (defun appt-make-list ()
!   "Create the appointments list from today's diary buffer.
  The time must be at the beginning of a line for it to be
  put in the appointments list (see examples in documentation of
  the function `appt-check').  We assume that the variables DATE and
  NUMBER hold the arguments that `list-diary-entries' received.
! They specify the range of dates that the diary is being processed for."
  
    ;; We have something to do if the range of dates that the diary is
    ;; considering includes the current date.
--- 527,541 ----
                   (defvar diary-entries-list))
  ;;;###autoload
  (defun appt-make-list ()
!   "Update the appointments list from today's diary buffer.
  The time must be at the beginning of a line for it to be
  put in the appointments list (see examples in documentation of
  the function `appt-check').  We assume that the variables DATE and
  NUMBER hold the arguments that `list-diary-entries' received.
! They specify the range of dates that the diary is being processed for.
! 
! Any appointments made with `appt-add' are not affected by this
! function."
  
    ;; We have something to do if the range of dates that the diary is
    ;; considering includes the current date.
***************
*** 544,550 ****
                      number)))))
        (save-excursion
        ;; Clear the appointments list, then fill it in from the diary.
!       (setq appt-time-msg-list nil)
        (if diary-entries-list
  
            ;; Cycle through the entry-list (diary-entries-list)
--- 549,559 ----
                      number)))))
        (save-excursion
        ;; Clear the appointments list, then fill it in from the diary.
!       (dolist (elt appt-time-msg-list)
!         ;; Delete any entries that were not made with appt-add.
!         (unless (nth 2 elt)
!           (setq appt-time-msg-list
!                 (delq elt appt-time-msg-list))))
        (if diary-entries-list
  
            ;; Cycle through the entry-list (diary-entries-list)