summaryrefslogtreecommitdiff
path: root/lisp/org/org.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-04-12 08:47:15 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-04-12 08:49:19 -0700
commitca509810014726cf6bee9f7e8f69bdeaf62dc146 (patch)
treebf9e81d82e77edebcd6addc1a9bc0392425b1bdd /lisp/org/org.el
parentc23c965bb9d0a4bcc1b6158833ff99aa20fd53e9 (diff)
downloademacs-ca509810014726cf6bee9f7e8f69bdeaf62dc146.tar.gz
Improve time zone documentation
* doc/lispref/os.texi (Time Zone Rules): New section, mostly with material moved here from other sections. * doc/emacs/cmdargs.texi (General Variables): * doc/lispref/os.texi (Time Conversion, Time Parsing): Xref new section. * etc/NEWS, etc/PROBLEMS: * lisp/org/org.el (org-timestamp-format): * src/editfns.c (Fformat_time_string, Fdecode_time) (Fencode_time, Fcurrent_time_string, Fcurrent_time_zone) (Fset_time_zone_rule): When documenting time zone rule strings, mention the TZ environment variable in preference to mentioning the sort-of-internal function set-time-zone-rule.
Diffstat (limited to 'lisp/org/org.el')
-rw-r--r--lisp/org/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d2b48a64e45..231daa9a6a7 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -22674,7 +22674,7 @@ 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
-`set-time-zone-rule' for a time zone rule."
+the TZ environment variable."
(format-time-string
format
(apply 'encode-time