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

Fix: Use org-timestamp-to-time everywhere

Browse source 
These changes should have been in adcb96c.

Thanks to Chris Rayner (@riscy) for noticing this omission.
This commit is contained in:
Adam Porter 2019-07-20 10:16:16 -05:00
parent c31f873625
commit f6d2d1e537
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
org-ql.el
View file

@ -443,8 +443,8 @@ ignored."
`(cl-loop for next-ts = (next-timestamp) `(cl-loop for next-ts = (next-timestamp)
while next-ts while next-ts
;; Using `setf' instead of `for beg =` here prevents "unused lexical variable" warnings. ;; Using `setf' instead of `for beg =` here prevents "unused lexical variable" warnings.
do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) do (setf beg (float-time (org-timestamp-to-time next-ts))
end (float-time (org-timestamp--to-internal-time next-ts 'end))) 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))
@ -605,8 +605,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
do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) do (setf beg (float-time (org-timestamp-to-time next-ts))
end (float-time (org-timestamp--to-internal-time next-ts 'end))) 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))
@ -648,8 +648,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)
do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) do (setf beg (float-time (org-timestamp-to-time next-ts))
end (float-time (org-timestamp--to-internal-time next-ts 'end))) 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))
@ -691,8 +691,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)
do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) do (setf beg (float-time (org-timestamp-to-time next-ts))
end (float-time (org-timestamp--to-internal-time next-ts 'end))) 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))