1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00

(diary-entry-time): Fix typo/bug:

Remove spurious left square bracket in XX:XXam regexp.
This commit is contained in:
Thien-Thi Nguyen 2004-01-17 13:48:26 +00:00
parent 7af0e8d775
commit d14b04bc3c
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2004-01-17 Thien-Thi Nguyen <ttn@gnu.org>
* calendar/diary-lib.el (diary-entry-time): Fix typo/bug:
Remove spurious left square bracket in XX:XXam regexp.
2004-01-16 Luc Teirlinck <teirllm@auburn.edu>
* progmodes/cc-defs.el: Do not require cl at run time.

View File

@ -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))