diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2004-01-08 23:35:07 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2004-01-08 23:35:07 +0000 |
| commit | 3b42c18565edad29cf4fdcf719949c64955c6d6d (patch) | |
| tree | a95172c781042c231cfd92c26e3a3e2f83074be4 /lisp/calendar/appt.el | |
| parent | 56d3bae7a91d0f1b5781c83fd61f2ebbdc239f64 (diff) | |
| download | emacs-3b42c18565edad29cf4fdcf719949c64955c6d6d.tar.gz | |
(appt-add): Also accept time in the form XX[.XX][am/pm/AM/PM].
(appt-make-list): Likewise.
(appt-convert-time): Likewise.
Diffstat (limited to 'lisp/calendar/appt.el')
| -rw-r--r-- | lisp/calendar/appt.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 6c018667af4..8c1562385c9 100644 --- a/lisp/calendar/appt.el +++ b/lisp/calendar/appt.el @@ -437,7 +437,8 @@ Usually just deletes the appointment buffer." The time should be in either 24 hour format or am/pm format." (interactive "sTime (hh:mm[am/pm]): \nsMessage: ") - (if (string-match "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?" new-appt-time) + (if (string-match "[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?" + new-appt-time) nil (error "Unacceptable time-string")) @@ -519,7 +520,7 @@ They specify the range of dates that the diary is being processed for." (calendar-current-date) (car (car entry-list)))) (let ((time-string (cadr (car entry-list)))) (while (string-match - "\\([0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\).*" + "\\([0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?\\).*" time-string) (let* ((beg (match-beginning 0)) ;; Get just the time for this appointment. @@ -527,7 +528,7 @@ They specify the range of dates that the diary is being processed for." ;; 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\\)?" + "^[ \t]*[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?" time-string (match-end 0))) ;; Get the whole string for this appointment. @@ -586,17 +587,17 @@ it from the original list." (defun appt-convert-time (time2conv) - "Convert hour:min[am/pm] format to minutes from midnight." - + "Convert hour:min[am/pm] format to minutes from midnight. +Also try to accept the hour.min[am/pm] format." (let ((conv-time 0) (hr 0) (min 0)) - (string-match ":\\([0-9][0-9]\\)" time2conv) + (string-match "[:.]\\([0-9][0-9]\\)" time2conv) (setq min (string-to-int (match-string 1 time2conv))) - (string-match "[0-9]?[0-9]:" time2conv) + (string-match "[0-9]?[0-9][:.]" time2conv) (setq hr (string-to-int (match-string 0 time2conv))) |