diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2016-04-11 00:32:43 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2016-04-11 00:32:43 -0400 |
| commit | 634e12a31ec880ae59a15419aa2b1e01e22f392e (patch) | |
| tree | 92151ba85abc1d4039543f29dc2f8399f07572e7 | |
| parent | 492d68c9369f228869644451042da8c035f8ebad (diff) | |
| parent | acfd4111939e44ad660316c4fda4d0f38364912f (diff) | |
| download | org-mode-634e12a31ec880ae59a15419aa2b1e01e22f392e.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org.el | 3 | ||||
| -rw-r--r-- | lisp/ox-icalendar.el | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index 72105cc..da16da5 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -23673,7 +23673,8 @@ time-range, if possible. When optional argument UTC is non-nil, time will be expressed as Universal Time." (format-time-string - format (org-timestamp--to-internal-time timestamp end) utc)) + format (org-timestamp--to-internal-time timestamp end) + (and utc t))) (defun org-timestamp-split-range (timestamp &optional end) "Extract a TIMESTAMP object from a date or time range. diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index 3552dda..5127ce5 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -397,7 +397,8 @@ Universal Time, ignoring `org-icalendar-date-time-format'." ;; Convert timestamp into internal time in order to use ;; `format-time-string' and fix any mistake (i.e. MI >= 60). (encode-time 0 mi h d m y) - (or utc (and with-time-p (org-icalendar-use-UTC-date-time-p))))))) + (and (or utc (and with-time-p (org-icalendar-use-UTC-date-time-p))) + t))))) (defun org-icalendar-dtstamp () "Return DTSTAMP property, as a string." |