|
@@ -570,13 +570,19 @@ inlinetask within the section."
|
|
;; happen once ENTRY is one of them.
|
|
;; happen once ENTRY is one of them.
|
|
(let ((counter 0))
|
|
(let ((counter 0))
|
|
(mapconcat
|
|
(mapconcat
|
|
- 'identity
|
|
|
|
|
|
+ #'identity
|
|
(org-element-map (cons (org-element-property :title entry)
|
|
(org-element-map (cons (org-element-property :title entry)
|
|
(org-element-contents inside))
|
|
(org-element-contents inside))
|
|
'timestamp
|
|
'timestamp
|
|
(lambda (ts)
|
|
(lambda (ts)
|
|
- (let ((uid (format "TS%d-%s" (incf counter) uid)))
|
|
|
|
- (org-icalendar--vevent entry ts uid summary loc desc cat)))
|
|
|
|
|
|
+ (when (let ((type (org-element-property :type ts)))
|
|
|
|
+ (case (plist-get info :with-timestamps)
|
|
|
|
+ (active (memq type '(active active-range)))
|
|
|
|
+ (inactive (memq type '(inactive inactive-range)))
|
|
|
|
+ ((t) t)))
|
|
|
|
+ (let ((uid (format "TS%d-%s" (incf counter) uid)))
|
|
|
|
+ (org-icalendar--vevent
|
|
|
|
+ entry ts uid summary loc desc cat))))
|
|
info nil (and (eq type 'headline) 'inlinetask))
|
|
info nil (and (eq type 'headline) 'inlinetask))
|
|
""))
|
|
""))
|
|
;; Task: First check if it is appropriate to export it.
|
|
;; Task: First check if it is appropriate to export it.
|
|
@@ -589,7 +595,7 @@ inlinetask within the section."
|
|
(and (eq type 'headline)
|
|
(and (eq type 'headline)
|
|
(not (org-icalendar-blocked-headline-p
|
|
(not (org-icalendar-blocked-headline-p
|
|
entry info))))
|
|
entry info))))
|
|
- ('t (eq todo-type 'todo))))
|
|
|
|
|
|
+ ((t) (eq todo-type 'todo))))
|
|
(org-icalendar--vtodo entry uid summary loc desc cat))
|
|
(org-icalendar--vtodo entry uid summary loc desc cat))
|
|
;; Diary-sexp: Collect every diary-sexp element within
|
|
;; Diary-sexp: Collect every diary-sexp element within
|
|
;; ENTRY and its title, and transcode them. If ENTRY is
|
|
;; ENTRY and its title, and transcode them. If ENTRY is
|
|
@@ -597,7 +603,7 @@ inlinetask within the section."
|
|
;; separately.
|
|
;; separately.
|
|
(when org-icalendar-include-sexps
|
|
(when org-icalendar-include-sexps
|
|
(let ((counter 0))
|
|
(let ((counter 0))
|
|
- (mapconcat 'identity
|
|
|
|
|
|
+ (mapconcat #'identity
|
|
(org-element-map
|
|
(org-element-map
|
|
(cons (org-element-property :title entry)
|
|
(cons (org-element-property :title entry)
|
|
(org-element-contents inside))
|
|
(org-element-contents inside))
|
|
@@ -613,7 +619,7 @@ inlinetask within the section."
|
|
;; inlinetask within it. In agenda export, this is independent
|
|
;; inlinetask within it. In agenda export, this is independent
|
|
;; from the mark (or lack thereof) on the entry.
|
|
;; from the mark (or lack thereof) on the entry.
|
|
(when (eq type 'headline)
|
|
(when (eq type 'headline)
|
|
- (mapconcat 'identity
|
|
|
|
|
|
+ (mapconcat #'identity
|
|
(org-element-map inside 'inlinetask
|
|
(org-element-map inside 'inlinetask
|
|
(lambda (task) (org-icalendar-entry task nil info))
|
|
(lambda (task) (org-icalendar-entry task nil info))
|
|
info) ""))
|
|
info) ""))
|