From: Thien-Thi Nguyen Date: Sat, 17 Jan 2004 13:48:26 +0000 (+0000) Subject: (diary-entry-time): Fix typo/bug: X-Git-Tag: ttn-vms-21-2-B4~7908 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d14b04bc3c93f090f8d865314b5a3255156124f2;p=emacs.git (diary-entry-time): Fix typo/bug: Remove spurious left square bracket in XX:XXam regexp. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f302da428e8..5b41992d11c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-01-17 Thien-Thi Nguyen + + * calendar/diary-lib.el (diary-entry-time): Fix typo/bug: + Remove spurious left square bracket in XX:XXam regexp. + 2004-01-16 Luc Teirlinck * progmodes/cc-defs.el: Do not require cl at run time. diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index 28fcb50ef14..d2a0075fb71 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el @@ -1118,7 +1118,7 @@ be used instead of a colon (:) to separate the hour and minute parts." (if (equal ?a (downcase (aref s (match-beginning 2)))) 0 1200))) ((string-match ; Hour and minute XX:XXam or XX:XXpm - "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.][\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) + "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) (+ (* 100 (% (string-to-int (substring s (match-beginning 1) (match-end 1))) 12))