diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2022-04-05 17:48:05 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-04-05 17:52:34 -0700 |
commit | 8ef37913d3be5ff518018acb6b0144d6e559b5ba (patch) | |
tree | 9986f71853857827dffe63527a9b527e2491d4a8 /lisp/org/ol.el | |
parent | 2aa588f016239e8fef3aeec97df7285f81b7f80b (diff) | |
download | emacs-8ef37913d3be5ff518018acb6b0144d6e559b5ba.tar.gz emacs-8ef37913d3be5ff518018acb6b0144d6e559b5ba.tar.bz2 emacs-8ef37913d3be5ff518018acb6b0144d6e559b5ba.zip |
Port Org encode-time usage back to Emacs 25
* lisp/org/ol.el (org-store-link):
* lisp/org/org-clock.el (org-clock-sum)
(org-clock-update-time-maybe):
* lisp/org/org-colview.el (org-colview-construct-allowed-dates):
* lisp/org/org-macro.el (org-macro--vc-modified-time):
* lisp/org/org-macs.el (org-2ft, org-matcher-time):
* lisp/org/org-table.el (org-table-eval-formula):
* lisp/org/org.el (org-read-date, org-display-custom-time)
(org-time-string-to-time, org-timestamp-change):
Don’t assume Emacs 27 encode-time, since standalone Org still
works with Emacs 25 and it’s easier if we minimize differences
from standalone Org. Problem reported by Max Nikulin (Bug#54731).
This reverts much of 2021-12-16T17:40:21Z!eggert@cs.ucla.edu.
Diffstat (limited to 'lisp/org/ol.el')
-rw-r--r-- | lisp/org/ol.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ol.el b/lisp/org/ol.el index 905e491f4ad..a03d85f618a 100644 --- a/lisp/org/ol.el +++ b/lisp/org/ol.el @@ -1575,7 +1575,7 @@ non-nil." (setq link (format-time-string (car org-time-stamp-formats) - (encode-time + (apply 'encode-time (list 0 0 0 (nth 1 cd) (nth 0 cd) (nth 2 cd) nil nil nil)))) (org-link-store-props :type "calendar" :date cd))) |