Simplify code

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

View file

@ -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.