diff options
| author | Thien-Thi Nguyen | 2004-01-17 13:48:26 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2004-01-17 13:48:26 +0000 |
| commit | d14b04bc3c93f090f8d865314b5a3255156124f2 (patch) | |
| tree | 54922d818c684249c1e27e4b0a31695aebcff081 | |
| parent | 7af0e8d77515d0da4d615c767628277667aa38c8 (diff) | |
| download | emacs-d14b04bc3c93f090f8d865314b5a3255156124f2.tar.gz emacs-d14b04bc3c93f090f8d865314b5a3255156124f2.zip | |
(diary-entry-time): Fix typo/bug:
Remove spurious left square bracket in XX:XXam regexp.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calendar/diary-lib.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f302da428e8..5b41992d11c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-01-17 Thien-Thi Nguyen <ttn@gnu.org> | ||
| 2 | |||
| 3 | * calendar/diary-lib.el (diary-entry-time): Fix typo/bug: | ||
| 4 | Remove spurious left square bracket in XX:XXam regexp. | ||
| 5 | |||
| 1 | 2004-01-16 Luc Teirlinck <teirllm@auburn.edu> | 6 | 2004-01-16 Luc Teirlinck <teirllm@auburn.edu> |
| 2 | 7 | ||
| 3 | * progmodes/cc-defs.el: Do not require cl at run time. | 8 | * 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." | |||
| 1118 | (if (equal ?a (downcase (aref s (match-beginning 2)))) | 1118 | (if (equal ?a (downcase (aref s (match-beginning 2)))) |
| 1119 | 0 1200))) | 1119 | 0 1200))) |
| 1120 | ((string-match ; Hour and minute XX:XXam or XX:XXpm | 1120 | ((string-match ; Hour and minute XX:XXam or XX:XXpm |
| 1121 | "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.][\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) | 1121 | "\\`[ \t\n\\^M]*\\([0-9]?[0-9]\\)[:.]\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) |
| 1122 | (+ (* 100 (% (string-to-int | 1122 | (+ (* 100 (% (string-to-int |
| 1123 | (substring s (match-beginning 1) (match-end 1))) | 1123 | (substring s (match-beginning 1) (match-end 1))) |
| 1124 | 12)) | 1124 | 12)) |