aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-05-18 13:12:08 +0000
committerDave Love2000-05-18 13:12:08 +0000
commitdae6cb9fe9067aeeeac317287e2410ae02af538f (patch)
tree45c70bd61e6dd441037ebc579146a5b99f8fac04
parenta198aa548e0ab281c214a3f97d6417f86f04c3a8 (diff)
downloademacs-dae6cb9fe9067aeeeac317287e2410ae02af538f.tar.gz
emacs-dae6cb9fe9067aeeeac317287e2410ae02af538f.zip
(appt-make-list): Match all lines of entry.
From "Stefan M. Walther (SMW)" <walther@netz.klinik.uni-mainz.de>
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/calendar/appt.el2
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b60936ddd71..e634f91a624 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12000-05-18 Dave Love <fx@gnu.org>
2
3 * info.el (Info-fontify-node): Add intangible property as well as
4 invisible.
5
6 * calendar/appt.el (appt-make-list): Match all lines of entry.
7 From "Stefan M. Walther (SMW)" <walther@netz.klinik.uni-mainz.de>
8
12000-05-18 Kenichi Handa <handa@etl.go.jp> 92000-05-18 Kenichi Handa <handa@etl.go.jp>
2 10
3 * international/mule-diag.el (describe-char-after): Call 11 * international/mule-diag.el (describe-char-after): Call
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 9b93db96c27..04c8a3dd607 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -526,7 +526,7 @@ They specify the range of dates that the diary is being processed for."
526 (cadr (car entry-list))) 1 -1))) 526 (cadr (car entry-list))) 1 -1)))
527 527
528 (while (string-match 528 (while (string-match
529 "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?.*" 529 "[0-9]?[0-9]:[0-9][0-9]\\(am\\|pm\\)?\\(.*\n\\)*.*"
530 time-string) 530 time-string)
531 (let* ((appt-time-string (match-string 0 time-string))) 531 (let* ((appt-time-string (match-string 0 time-string)))
532 532