summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Abrahamsen <eric@ericabrahamsen.net>2017-08-20 00:12:57 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-08-20 00:12:57 +0200
commit7973ec105774e97639502c85b9e914cbbab8d517 (patch)
treeb30c10840c1c3012ea39137ad9aa205892c14081
parent42458e682d42c926c8c8249388c0104982e46226 (diff)
downloadorg-mode-7973ec105774e97639502c85b9e914cbbab8d517.tar.gz
Inherit TIMEZONE and LOCATION properties in iCalendar export
* lisp/ox-icalendar.el (org-icalendar-entry): Both properties now optionally inherit, depending on value of `org-use-property-inheritance'. * doc/org.texi: Mention change.
-rw-r--r--doc/org.texi2
-rw-r--r--etc/ORG-NEWS3
-rw-r--r--lisp/ox-icalendar.el8
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/org.texi b/doc/org.texi
index a687d65..c391c8a 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -14165,7 +14165,7 @@ and write it to @code{org-icalendar-combined-agenda-file} file name.
@cindex property, TIMEZONE
The iCalendar export back-end includes SUMMARY, DESCRIPTION, LOCATION and
TIMEZONE properties from the Org entries when exporting. To force the
-back-end to inherit the LOCATION property, configure the
+back-end to inherit the LOCATION and TIMEZONE properties, configure the
@code{org-use-property-inheritance} variable.
When Org entries do not have SUMMARY, DESCRIPTION and LOCATION properties,
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1bef693..1901c29 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -106,6 +106,9 @@ You can use =ob-scala.el= as packaged in scala-mode, available from the
MELPA repository.
** New features
+*** iCalendar export uses inheritance for TIMEZONE and LOCATION properties
+Both these properties can be inherited during iCalendar export,
+depending on the value of ~org-use-property-inheritance~.
*** iCalendar export respects a TIMEZONE property
Set the TIMEZONE property on an entry to specify a time zone for that
entry only during iCalendar export. The property value should be
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index d445c7b..b27c30c 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -537,7 +537,9 @@ inlinetask within the section."
(org-export-data
(org-element-property :title entry) info))))
(loc (org-icalendar-cleanup-string
- (org-element-property :LOCATION entry)))
+ (org-export-get-node-property
+ :LOCATION entry
+ (org-property-inherit-p "LOCATION"))))
;; Build description of the entry from associated section
;; (headline) or contents (inlinetask).
(desc
@@ -553,7 +555,9 @@ inlinetask within the section."
org-icalendar-include-body))))
(org-icalendar-include-body (org-trim contents)))))))
(cat (org-icalendar-get-categories entry info))
- (tz (org-element-property :TIMEZONE entry)))
+ (tz (org-export-get-node-property
+ :TIMEZONE entry
+ (org-property-inherit-p "TIMEZONE"))))
(concat
;; Events: Delegate to `org-icalendar--vevent' to generate
;; "VEVENT" component from scheduled, deadline, or any