aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calendar/icalendar.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2c4dcd36f8..031103c0ed8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-08-17 Glenn Morris <rgm@gnu.org>
2
3 * calendar/icalendar.el (icalendar--convert-recurring-to-diary):
4 Fix format call.
5
12010-08-17 Michael Albinus <michael.albinus@gmx.de> 62010-08-17 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-handle-make-symbolic-link): Flush file 8 * net/tramp.el (tramp-handle-make-symbolic-link): Flush file
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 2dcf75758c0..03535abbb77 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -2092,6 +2092,7 @@ END-T is the event's end time in diary format."
2092 (format "(diary-cyclic %d %s) " 2092 (format "(diary-cyclic %d %s) "
2093 (* interval 7) 2093 (* interval 7)
2094 dtstart-conv)) 2094 dtstart-conv))
2095 dtstart-conv
2095 (if count until-1-conv until-conv) 2096 (if count until-1-conv until-conv)
2096 )) 2097 ))
2097 (setq result 2098 (setq result