summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-22 22:59:29 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-22 22:59:29 +0100
commit9d39c9a2badafc6368e0fbfc099c4638ddfcba15 (patch)
tree215077c3c7b6ffe81a0e2407d90a638f6b4291e7
parent58af2e01be28d861ac865bdb089be5fe8209bc4b (diff)
parent3bf19b30f06a32b6ad75b368f8c51be69c53fa3f (diff)
downloadorg-mode-9d39c9a2badafc6368e0fbfc099c4638ddfcba15.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-icalendar.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el
index 7341300..c97c36a 100644
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@@ -904,8 +904,8 @@ This function assumes major mode for current buffer is
(org-icalendar--vcalendar
org-icalendar-combined-name
user-full-name
- org-icalendar-combined-description
(or (org-string-nw-p org-icalendar-timezone) (cadr (current-time-zone)))
+ org-icalendar-combined-description
contents)))
(run-hook-with-args 'org-icalendar-after-save-hook file)))