diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calendar/diary-lib.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el index df469978c89..b658566eeca 100644 --- a/lisp/calendar/diary-lib.el +++ b/lisp/calendar/diary-lib.el | |||
| @@ -892,8 +892,7 @@ and XX:XXam or XX:XXpm." | |||
| 892 | (+ (* 100 (% (string-to-int | 892 | (+ (* 100 (% (string-to-int |
| 893 | (substring s (match-beginning 1) (match-end 1))) | 893 | (substring s (match-beginning 1) (match-end 1))) |
| 894 | 12)) | 894 | 12)) |
| 895 | (if (string-equal "a" | 895 | (if (equal ?a (downcase (aref s (match-beginning 2)))) |
| 896 | (substring s (match-beginning 2) (match-end 2))) | ||
| 897 | 0 1200))) | 896 | 0 1200))) |
| 898 | ((string-match;; Hour and minute XX:XXam or XX:XXpm | 897 | ((string-match;; Hour and minute XX:XXam or XX:XXpm |
| 899 | "^[ \t]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) | 898 | "^[ \t]*\\([0-9]?[0-9]\\):\\([0-9][0-9]\\)\\([ap]\\)m\\>" s) |
| @@ -901,8 +900,7 @@ and XX:XXam or XX:XXpm." | |||
| 901 | (substring s (match-beginning 1) (match-end 1))) | 900 | (substring s (match-beginning 1) (match-end 1))) |
| 902 | 12)) | 901 | 12)) |
| 903 | (string-to-int (substring s (match-beginning 2) (match-end 2))) | 902 | (string-to-int (substring s (match-beginning 2) (match-end 2))) |
| 904 | (if (string-equal "a" | 903 | (if (equal ?a (downcase (aref s (match-beginning 3)))) |
| 905 | (substring s (match-beginning 3) (match-end 3))) | ||
| 906 | 0 1200))) | 904 | 0 1200))) |
| 907 | (t -9999)));; Unrecognizable | 905 | (t -9999)));; Unrecognizable |
| 908 | 906 | ||