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

Simplify code

Browse source
This commit is contained in:
Ihor Radchenko 2021-04-14 20:40:32 +08:00
parent 204e2d239e
commit 93a7f5c8dd
No known key found for this signature in database
GPG key ID: 6470762A7DA11D8B
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
org-ql.el
View file

@ -1247,10 +1247,8 @@ result form."
do do
(-let* (((&plist :regexp :case-fold :query) preamble)) (-let* (((&plist :regexp :case-fold :query) preamble))
(if regexp (if regexp
(cond (when (or (not query) (eq query t))
((eq query t) (setq query `(regexp ,regexp))) (setq query `(regexp ,regexp)))
((not query) (setq query `(regexp ,regexp)))
(t nil))
(unless query (setq query clause))) (unless query (setq query clause)))
(push query queries) (push query queries)
;; Take the longest regexp. It should be hardest to match. ;; Take the longest regexp. It should be hardest to match.
@ -1276,9 +1274,8 @@ result form."
do do
(-let* (((&plist :regexp :case-fold :query) preamble)) (-let* (((&plist :regexp :case-fold :query) preamble))
(if regexp (if regexp
(cond (when (or (not query) (eq query t))
((eq query t) (setq query `(regexp ,regexp))) (setq query `(regexp ,regexp)))
((not query) (setq query `(regexp ,regexp))))
(unless query (setq query clause))) (unless query (setq query clause)))
(push query queries) (push query queries)
;; Collect regexps for combining. ;; Collect regexps for combining.