[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.43 emacs/lisp/calendar/appt.el:1.44
*** emacs/lisp/calendar/appt.el:1.43    Wed Jul  3 10:25:57 2002
--- emacs/lisp/calendar/appt.el Mon Aug 12 13:21:06 2002
***************
*** 516,541 ****
                                               (cadr (car entry-list))) 1 -1)))
  
                  (while (string-match
!                         "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\(.*\n\\)*.*"
                          time-string)
!                   (let* ((appt-time-string (match-string 0 time-string)))
  
!                     (if (< (match-end 0) (length time-string))
!                         (setq new-time-string (substring time-string 
!                                                          (+ (match-end 0) 1)
!                                                          nil))
!                       (setq new-time-string ""))
  
!                     (string-match "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?"
!                                   time-string)
! 
!                     (let* ((appt-time (list (appt-convert-time 
!                                              (match-string 0 time-string))))
!                            (time-msg (cons appt-time
!                                            (list appt-time-string))))
!                       (setq time-string new-time-string)
!                       (setq appt-time-msg-list (nconc appt-time-msg-list
!                                                       (list time-msg)))))))
                (setq entry-list (cdr entry-list)))))
        (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))
  
--- 516,545 ----
                                               (cadr (car entry-list))) 1 -1)))
  
                  (while (string-match
!                         "\\([0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\).*"
                          time-string)
!                   (let* ((beg (match-beginning 0))
!                          ;; Get just the time for this appointment.
!                          (only-time (match-string 1 time-string))
!                          ;; Find the end of this appointment
!                          ;; (the start of the next).
!                          (end (string-match
!                                "^[ \t]*[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?"
!                                time-string
!                                (match-end 0)))
!                          ;; Get the whole string for this appointment.
!                          (appt-time-string
!                           (substring time-string beg (if end (1- end)))))
  
!                     ;; Add this appointment to appt-time-msg-list.
!                     (let* ((appt-time (list (appt-convert-time only-time)))
!                            (time-msg (list appt-time appt-time-string)))
!                       (setq appt-time-msg-list
!                             (nconc appt-time-msg-list (list time-msg))))
  
!                     ;; Discard this appointment from the string.
!                     (setq time-string
!                           (if end (substring time-string end) "")))))
                (setq entry-list (cdr entry-list)))))
        (setq appt-time-msg-list (appt-sort-list appt-time-msg-list))