branch: externals/relint commit 104e66c28923bafcf9dbef1d1c0fa6f7b9a0c14a Author: Mattias Engdegård <matti...@acm.org> Commit: Mattias Engdegård <matti...@acm.org>
Fix bugs in evaluation of `rx' and `rx-to-strings' Found by trawling ntcmd.el, on a suggestion by Pierre Téchoueyres. --- trawl.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trawl.el b/trawl.el index 4298210..0ae230c 100644 --- a/trawl.el +++ b/trawl.el @@ -311,13 +311,13 @@ ;; rx, rx-to-string: check for (eval ...) constructs first, then apply. ((eq (car form) 'rx) - (if (trawl--rx-safe (cdr form)) + (if (trawl--rx-safe (cons 'seq (cdr form))) (trawl--eval (macroexpand form)) 'no-value)) ((eq (car form) 'rx-to-string) - (if (trawl--rx-safe (cdr form)) - (let ((arg (trawl--eval (cadr form)))) + (let ((arg (trawl--eval (cadr form)))) + (if (trawl--rx-safe arg) (if (eq arg 'no-value) 'no-value (apply 'rx-to-string (list arg))))