summaryrefslogtreecommitdiff
path: root/lisp/org/org.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/org.el')
-rw-r--r--lisp/org/org.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 231daa9a6a..3abf62704b 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -22673,8 +22673,10 @@ When optional argument END is non-nil, use end of date-range or
time-range, if possible.
The optional ZONE is omitted or nil for Emacs local time, t for
-Universal Time, `wall' for system wall clock time, or a string as in
-the TZ environment variable."
+Universal Time, `wall' for system wall clock time, or a string as
+in the TZ environment variable. It can also be a list (as from
+`current-time-zone') or an integer (as from `decode-time')
+applied without consideration for daylight saving time."
(format-time-string
format
(apply 'encode-time