jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename org-timestamp--to-internal-time' into org-timestamp-to-time'

Browse source 
Also checks if older version of org timestamp exists, in case user has
older version.
This commit is contained in:
Ataias Pereira Reis 2019-06-12 10:47:19 -03:00
parent 0aec8ec603
commit 4efaf6d6b4
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
org-ql.el
View file

@ -27,6 +27,10 @@
;;;; Variables ;;;; Variables
(if (fboundp 'org-timestamp--to-internal-time)
(defalias 'org-timestamp-to-time 'org-timestamp--to-internal-time)
nil)
(defvar org-ql--today nil) (defvar org-ql--today nil)
(defvar org-ql-cache (make-hash-table :weakness 'key) (defvar org-ql-cache (make-hash-table :weakness 'key)
@ -362,8 +366,8 @@ ignored."
(test-timestamps (pred-form) (test-timestamps (pred-form)
`(cl-loop for next-ts = (next-timestamp) `(cl-loop for next-ts = (next-timestamp)
while next-ts while next-ts
for beg = (float-time (org-timestamp--to-internal-time next-ts)) for beg = (float-time (org-timestamp-to-time next-ts))
for end = (float-time (org-timestamp--to-internal-time next-ts 'end)) for end = (float-time (org-timestamp-to-time next-ts 'end))
thereis ,pred-form))) thereis ,pred-form)))
(save-excursion (save-excursion
(let ((end-pos (org-entry-end-position))) (let ((end-pos (org-entry-end-position)))
@ -518,8 +522,8 @@ FROM, TO, and ON should be strings parseable by
(test-timestamps (pred-form) (test-timestamps (pred-form)
`(cl-loop for next-ts = (next-timestamp) `(cl-loop for next-ts = (next-timestamp)
while next-ts while next-ts
for beg = (float-time (org-timestamp--to-internal-time next-ts)) for beg = (float-time (org-timestamp-to-time next-ts))
for end = (float-time (org-timestamp--to-internal-time next-ts 'end)) for end = (float-time (org-timestamp-to-time next-ts 'end))
thereis ,pred-form))) thereis ,pred-form)))
(save-excursion (save-excursion
(let ((end-pos (org-entry-end-position))) (let ((end-pos (org-entry-end-position)))
@ -558,8 +562,8 @@ FROM, TO, and ON should be strings parseable by
`(cl-loop for next-ts = (next-timestamp) `(cl-loop for next-ts = (next-timestamp)
while next-ts while next-ts
when (string-prefix-p "<" next-ts) when (string-prefix-p "<" next-ts)
for beg = (float-time (org-timestamp--to-internal-time next-ts)) for beg = (float-time (org-timestamp-to-time next-ts))
for end = (float-time (org-timestamp--to-internal-time next-ts 'end)) for end = (float-time (org-timestamp-to-time next-ts 'end))
thereis ,pred-form))) thereis ,pred-form)))
(save-excursion (save-excursion
(let ((end-pos (org-entry-end-position))) (let ((end-pos (org-entry-end-position)))
@ -598,8 +602,8 @@ FROM, TO, and ON should be strings parseable by
`(cl-loop for next-ts = (next-timestamp) `(cl-loop for next-ts = (next-timestamp)
while next-ts while next-ts
when (string-prefix-p "[" next-ts) when (string-prefix-p "[" next-ts)
for beg = (float-time (org-timestamp--to-internal-time next-ts)) for beg = (float-time (org-timestamp-to-time next-ts))
for end = (float-time (org-timestamp--to-internal-time next-ts 'end)) for end = (float-time (org-timestamp-to-time next-ts 'end))
thereis ,pred-form))) thereis ,pred-form)))
(save-excursion (save-excursion
(let ((end-pos (org-entry-end-position))) (let ((end-pos (org-entry-end-position)))