ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2016-04-11 00:32:43 -04:00
parent 492d68c936 acfd411193
commit 634e12a31e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -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.

3
lisp/ox-icalendar.el
View File

@ -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."