From 00ddf74b232b0762baa7826e62f6765d087041fb Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Thu, 5 Feb 2026 16:10:09 -0600
Subject: fix(calendar-sync): fix heading order, continuation lines, and
 exception text cleaning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Three bugs found during manual verification of calendar sync output:

1. Heading/timestamp order reversed in event-to-org — nreverse pattern
   put timestamp before the org heading. Swap initial list order.

2. get-property continuation line regex broken — the ^ anchor in
   "^\n[ \t]" prevented matching at the correct position, truncating
   long DESCRIPTION values at the first ICS line fold. Remove anchor,
   add explicit position check (matching get-all-property-lines pattern).

3. collect-recurrence-exceptions didn't clean text — exception instances
   got raw ICS text (literal \n, HTML tags) replacing the cleaned base
   event text. Wrap summary/description/location in clean-text.
---
 modules/calendar-sync.el | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'modules/calendar-sync.el')

diff --git a/modules/calendar-sync.el b/modules/calendar-sync.el
index fadad6c0..06248531 100644
--- a/modules/calendar-sync.el
+++ b/modules/calendar-sync.el
@@ -413,9 +413,12 @@ Each exception plist contains :recurrence-id (parsed), :start, :end, :summary, e
                      (end-tzid (calendar-sync--extract-tzid dtend-line))
                      (start-parsed (calendar-sync--parse-timestamp dtstart start-tzid))
                      (end-parsed (and dtend (calendar-sync--parse-timestamp dtend end-tzid)))
-                     (summary (calendar-sync--get-property event-str "SUMMARY"))
-                     (description (calendar-sync--get-property event-str "DESCRIPTION"))
-                     (location (calendar-sync--get-property event-str "LOCATION")))
+                     (summary (calendar-sync--clean-text
+                               (calendar-sync--get-property event-str "SUMMARY")))
+                     (description (calendar-sync--clean-text
+                                   (calendar-sync--get-property event-str "DESCRIPTION")))
+                     (location (calendar-sync--clean-text
+                                (calendar-sync--get-property event-str "LOCATION"))))
                 (when (and recurrence-id-parsed start-parsed)
                   ;; Convert RECURRENCE-ID to local time
                   ;; Handle: UTC (Z suffix), TZID, or assume local
@@ -658,9 +661,10 @@ Returns nil if property not found."
   (when (string-match (format "^%s[^:\n]*:\\(.*\\)$" (regexp-quote property)) event)
     (let ((value (match-string 1 event))
           (start (match-end 0)))
-      ;; Handle continuation lines (start with space or tab)
+      ;; Handle continuation lines (RFC 5545 §3.1: folded lines start with space or tab)
       (while (and (< start (length event))
-                  (string-match "^\n[ \t]\\(.*\\)$" event start))
+                  (string-match "\n[ \t]\\([^\n]*\\)" event start)
+                  (= (match-beginning 0) start))
         (setq value (concat value (match-string 1 event)))
         (setq start (match-end 0)))
       value)))
@@ -1164,7 +1168,7 @@ Description appears as body text after the drawer."
       (push (format ":URL: %s" url) props))
     (setq props (nreverse props))
     ;; Build output
-    (let ((parts (list (format "* %s" summary) timestamp)))
+    (let ((parts (list timestamp (format "* %s" summary))))
       ;; Add property drawer if any properties exist
       (when props
         (push ":PROPERTIES:" parts)
-- 
cgit v1.2.3