Fix preamble for body in when and unless predicates

This commit is contained in:
Ihor Radchenko 2021-04-14 20:48:46 +08:00
parent 93a7f5c8dd
commit 60c67b4cd3
No known key found for this signature in database
GPG key ID: 6470762A7DA11D8B

View file

@ -1296,7 +1296,7 @@ result form."
,@(mapcar #'org-ql-normalize-query clauses)))) ,@(mapcar #'org-ql-normalize-query clauses))))
:preambles :preambles
((`(when ,condition . ,clauses) ((`(when ,condition . ,clauses)
(-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble `(and ,condition ,(last clauses))))) (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble `(and ,condition ,(car (last clauses))))))
(list :regexp regexp (list :regexp regexp
:case-fold case-fold :case-fold case-fold
:query `(when ,condition ,@clauses)))))) :query `(when ,condition ,@clauses))))))
@ -1309,7 +1309,7 @@ result form."
,@(mapcar #'org-ql-normalize-query clauses)))) ,@(mapcar #'org-ql-normalize-query clauses))))
:preambles :preambles
((`(unless ,condition . ,clauses) ((`(unless ,condition . ,clauses)
(-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble ,(last clauses)))) (-let* (((&plist :regexp :case-fold :query) (org-ql-query-preamble (car (last clauses)))))
(list :regexp regexp (list :regexp regexp
:case-fold case-fold :case-fold case-fold
:query `(unless ,condition ,@clauses)))))) :query `(unless ,condition ,@clauses))))))