From f6d2d1e5374c9b8a8f8565f3222c42371db1b95d Mon Sep 17 00:00:00 2001 From: Adam Porter Date: Sat, 20 Jul 2019 10:16:16 -0500 Subject: [PATCH] Fix: Use org-timestamp-to-time everywhere These changes should have been in adcb96c. Thanks to Chris Rayner (@riscy) for noticing this omission. --- org-ql.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/org-ql.el b/org-ql.el index 78abc4e..a24fa2f 100644 --- a/org-ql.el +++ b/org-ql.el @@ -443,8 +443,8 @@ ignored." `(cl-loop for next-ts = (next-timestamp) while next-ts ;; Using `setf' instead of `for beg =` here prevents "unused lexical variable" warnings. - do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) - end (float-time (org-timestamp--to-internal-time next-ts 'end))) + do (setf beg (float-time (org-timestamp-to-time next-ts)) + end (float-time (org-timestamp-to-time next-ts 'end))) thereis ,pred-form))) (save-excursion (let ((end-pos (org-entry-end-position)) @@ -605,8 +605,8 @@ FROM, TO, and ON should be strings parseable by (test-timestamps (pred-form) `(cl-loop for next-ts = (next-timestamp) while next-ts - do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) - end (float-time (org-timestamp--to-internal-time next-ts 'end))) + do (setf beg (float-time (org-timestamp-to-time next-ts)) + end (float-time (org-timestamp-to-time next-ts 'end))) thereis ,pred-form))) (save-excursion (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) while next-ts when (string-prefix-p "<" next-ts) - do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) - end (float-time (org-timestamp--to-internal-time next-ts 'end))) + do (setf beg (float-time (org-timestamp-to-time next-ts)) + end (float-time (org-timestamp-to-time next-ts 'end))) thereis ,pred-form))) (save-excursion (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) while next-ts when (string-prefix-p "[" next-ts) - do (setf beg (float-time (org-timestamp--to-internal-time next-ts)) - end (float-time (org-timestamp--to-internal-time next-ts 'end))) + do (setf beg (float-time (org-timestamp-to-time next-ts)) + end (float-time (org-timestamp-to-time next-ts 'end))) thereis ,pred-form))) (save-excursion (let ((end-pos (org-entry-end-position))