diff options
| author | Paul Eggert | 2016-04-12 08:50:47 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-12 08:50:47 -0700 |
| commit | 7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08 (patch) | |
| tree | c038edb545cc82ee825390d1e7691a247fd7fc5f /lisp/org | |
| parent | 435da5d2955ce35be4785b7d46566ed9b42ea9fb (diff) | |
| parent | ca509810014726cf6bee9f7e8f69bdeaf62dc146 (diff) | |
| download | emacs-7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08.tar.gz emacs-7c2c2196fd4be0b656bdf0e0b68f3d7c4a5eca08.zip | |
Merge from origin/emacs-25
ca50981 Improve time zone documentation
c23c965 Prevent bootstrap autoload backup files
9344612 Disable multicolor fonts on OS X since they are not supported...
c41ce1c Capitalize “Universal Time” in documentation
10597c9 Don't use 'find-program'
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org.el | 2 |
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. | |||
| 22674 | 22674 | ||
| 22675 | The optional ZONE is omitted or nil for Emacs local time, t for | 22675 | The optional ZONE is omitted or nil for Emacs local time, t for |
| 22676 | Universal Time, `wall' for system wall clock time, or a string as in | 22676 | Universal Time, `wall' for system wall clock time, or a string as in |
| 22677 | `set-time-zone-rule' for a time zone rule." | 22677 | the TZ environment variable." |
| 22678 | (format-time-string | 22678 | (format-time-string |
| 22679 | format | 22679 | format |
| 22680 | (apply 'encode-time | 22680 | (apply 'encode-time |