From 130382779b881cc0afa0293060ad91b85e57e6ef Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 11 Feb 2024 15:11:11 +0100 Subject: [PATCH] testing/lisp/test-duplicates-detector.el: Fix Emacs 27 compatibility * testing/lisp/test-duplicates-detector.el (test-duplicates-detector--find-duplicates): Do not use `while-let' that is not yet available in Emacs 27. --- testing/lisp/test-duplicates-detector.el | 39 ++++++++++++------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/testing/lisp/test-duplicates-detector.el b/testing/lisp/test-duplicates-detector.el index 349b5297b..2e9222e10 100644 --- a/testing/lisp/test-duplicates-detector.el +++ b/testing/lisp/test-duplicates-detector.el @@ -145,25 +145,26 @@ Duplicate forms will be written to (goto-char (point-min)) (while (search-forward "(ert-deftest" nil t) (goto-char (match-beginning 0)) - (ignore-errors - (while-let ((deftest (or (read (current-buffer)) t)) - ((eq (car deftest) 'ert-deftest)) - (test-name (cadr deftest))) - (if-let ((f (seq-find - (lambda (x) - (equal-including-properties - ;; if cadddr is a docstring - (if (stringp (cadddr deftest)) - (cddddr deftest) - (cdddr deftest)) - (if (stringp (cadddr x)) - (cddddr x) - (cdddr x)))) - found-deftests))) - (push (cons test-name (cadr f)) duplicate-tests) - (push deftest found-deftests) - (test-duplicates-detector--search-forms-recursively - deftest (list file test-name))))))))) + (let (deftest test-name) + (ignore-errors + (while (setq deftest (read (current-buffer))) + (setq test-name (cadr deftest)) + (when (eq (car deftest) 'ert-deftest) + (if-let ((f (seq-find + (lambda (x) + (equal-including-properties + ;; if cadddr is a docstring + (if (stringp (cadddr deftest)) + (cddddr deftest) + (cdddr deftest)) + (if (stringp (cadddr x)) + (cddddr x) + (cdddr x)))) + found-deftests))) + (push (cons test-name (cadr f)) duplicate-tests) + (push deftest found-deftests) + (test-duplicates-detector--search-forms-recursively + deftest (list file test-name))))))))))) (setq test-duplicates-detector-duplicate-forms (seq-filter #'cdr