summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Functions/Calendar/calendar3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 96d2bd59f..869f70429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-05  Peter Stephenson  <pws@csr.com>
+
+	* unposted: Functions/Calendar/calendar: make sure there's a
+	space between a date of a recurring event and the rest of
+	the line.
+
 2007-09-04  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* users/11807: Src/exec.c, Src/jobs.c: display of jobs in
diff --git a/Functions/Calendar/calendar b/Functions/Calendar/calendar
index b5df2ca72..7dec84e28 100644
--- a/Functions/Calendar/calendar
+++ b/Functions/Calendar/calendar
@@ -317,6 +317,9 @@ fi
       if (( shown && repeating )); then
 	# Done and dusted, but a repeated event is due.
 	strftime -s newdate $datefmt $repeattime
+	if [[ $newdate != *[[:space:]] && $restline != [[:space:]]* ]]; then
+	  newdate+=" "
+	fi
 	calendar_addlines+=("$newdate$restline")
 
 	# We'll add this back in below, but we check in case the