From 3b42c18565edad29cf4fdcf719949c64955c6d6d Mon Sep 17 00:00:00 2001 From: Thien-Thi Nguyen Date: Thu, 8 Jan 2004 23:35:07 +0000 Subject: [PATCH] (appt-add): Also accept time in the form XX[.XX][am/pm/AM/PM]. (appt-make-list): Likewise. (appt-convert-time): Likewise. --- lisp/ChangeLog | 14 ++++++++++++-- lisp/calendar/appt.el | 15 ++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 118cc53fb4..dad6eb6b4d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2004-01-09 Deepak Goel + + * calendar/diary-lib.el (diary-entry-time): + Also accept time in the form XX[.XX][am/pm/AM/PM]. + (fancy-diary-font-lock-keywords): Likewise. + (diary-font-lock-keywords): Likewise. + * calendar/appt.el (appt-add): Likewise. + (appt-make-list): Likewise. + (appt-convert-time): Likewise. + 2004-01-08 Nick Roberts * gdb-ui.el (gdb-ann3): Revert previous change. @@ -192,7 +202,7 @@ (term-sentinel): New function. (term-handle-exit): New function. - * subr.el (assoc-ignore-case, assoc-ignore-representation): + * subr.el (assoc-ignore-case, assoc-ignore-representation): Use assoc-string, and mark them obsolete. (delay-mode-hooks): Mark as permanent local. @@ -876,7 +886,7 @@ * xml.el (xml-parse-region): Allow comments to appear after the topmost element has closed. (xml-ns-parse-ns-attrs, xml-ns-expand-el) - (xml-ns-expand-attr): New functions to do namespace handling. + (xml-ns-expand-attr): New functions to do namespace handling. (xml-intern-attrlist): Back-compatible handling of attribute names. (xml-parse-tag): Move namespace handling to seperate functions. diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el index 6c018667af..8c1562385c 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))) -- 2.39.2