branch: externals/compat
commit d4231e73e05864541ec2f818dfdb294f0d05ae99
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
compat-tests: Enable merge-ordered-lists test on Emacs 30
---
compat-tests.el | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/compat-tests.el b/compat-tests.el
index a8d1f35a4f..748726e3f3 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -3057,21 +3057,17 @@
(should-equal (completion-lazy-hilit "test") "test"))
(ert-deftest compat-merge-ordered-lists ()
- ;; TODO: Reenable this test when `merge-ordered-lists' is available on the CI
- ;; Emacs version
- (static-if (< emacs-major-version 30)
- (progn
- (should-equal (merge-ordered-lists
- '((B A) (C A) (D B) (E D C))
- (lambda (_) (error "cycle")))
- '(E D B C A))
- (should-equal (merge-ordered-lists
- '((E D C) (B A) (C A) (D B))
- (lambda (_) (error "cycle")))
- '(E D C B A))
- (should-error (merge-ordered-lists
- '((E C D) (B A) (A C) (D B))
- (lambda (_) (error "cycle")))))))
+ (should-equal (merge-ordered-lists
+ '((B A) (C A) (D B) (E D C))
+ (lambda (_) (error "cycle")))
+ '(E D B C A))
+ (should-equal (merge-ordered-lists
+ '((E D C) (B A) (C A) (D B))
+ (lambda (_) (error "cycle")))
+ '(E D C B A))
+ (should-error (merge-ordered-lists
+ '((E C D) (B A) (A C) (D B))
+ (lambda (_) (error "cycle")))))
(provide 'compat-tests)
;;; compat-tests.el ends here
