From 93a7f5c8ddfc8efc39d24a54db20e2b1efc12c71 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Wed, 14 Apr 2021 20:40:32 +0800 Subject: [PATCH] Simplify code --- org-ql.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/org-ql.el b/org-ql.el index 9b3105c..4808ca8 100644 --- a/org-ql.el +++ b/org-ql.el @@ -1247,10 +1247,8 @@ result form." do (-let* (((&plist :regexp :case-fold :query) preamble)) (if regexp - (cond - ((eq query t) (setq query `(regexp ,regexp))) - ((not query) (setq query `(regexp ,regexp))) - (t nil)) + (when (or (not query) (eq query t)) + (setq query `(regexp ,regexp))) (unless query (setq query clause))) (push query queries) ;; Take the longest regexp. It should be hardest to match. @@ -1276,9 +1274,8 @@ result form." do (-let* (((&plist :regexp :case-fold :query) preamble)) (if regexp - (cond - ((eq query t) (setq query `(regexp ,regexp))) - ((not query) (setq query `(regexp ,regexp)))) + (when (or (not query) (eq query t)) + (setq query `(regexp ,regexp))) (unless query (setq query clause))) (push query queries) ;; Collect regexps for combining.