diff options
| author | Daniel Mendler <mail@daniel-mendler.de> | 2023-11-23 18:20:39 +0100 |
|---|---|---|
| committer | Daniel Mendler <mail@daniel-mendler.de> | 2023-11-23 18:20:39 +0100 |
| commit | 8e64b24e6441bb7cb6edbe3005b3ae2872b42f12 (patch) | |
| tree | e8853ce8d6a7d94b951f94a5c88d254662bbb5e8 /compat-tests.el | |
| parent | 091e8946bc347c043cd7bcd106e96e5c99b3aad0 (diff) | |
| parent | 6edcbb0bfc916a5ee0e1887f1cf10554e9066ea1 (diff) | |
Merge branch 'main' into emacs-30
Diffstat (limited to 'compat-tests.el')
| -rw-r--r-- | compat-tests.el | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/compat-tests.el b/compat-tests.el index 53c6269..74def73 100644 --- a/compat-tests.el +++ b/compat-tests.el @@ -1191,8 +1191,6 @@ (should-equal '((0 . zero) a (0 . zero)) (compat-call assoc-delete-all 0 (list (cons 0 'zero) (cons 1 'one) 'a (cons 0 'zero)) #'/=)) (should-equal '(a (0 . zero) (0 . zero)) (compat-call assoc-delete-all 0 (list 'a (cons 0 'zero) (cons 1 'one) (cons 0 'zero)) #'/=))) -;; TODO Fix broken test on Emacs 30. This test is likely broken since -;; 4194f9bd8705b7ccc23f49aa5795af228dab26bb on Emacs master. (ert-deftest compat-provided-derived-mode-p () (let ((one (make-symbol "1")) (two (make-symbol "2")) @@ -1202,26 +1200,26 @@ (put two 'derived-mode-parent one) (put one.5 'derived-mode-parent one) (put three 'derived-mode-parent two) - (should-equal one (provided-mode-derived-p one one)) - (should-equal one (provided-mode-derived-p two one)) - (should-equal one (provided-mode-derived-p three one)) + (should (provided-mode-derived-p one one)) + (should (provided-mode-derived-p two one)) + (should (provided-mode-derived-p three one)) (should-not (provided-mode-derived-p one eins)) (should-not (provided-mode-derived-p two eins)) (should-not (provided-mode-derived-p two one.5)) - (should-equal one (provided-mode-derived-p two one.5 one)) - (should-equal two (provided-mode-derived-p two one.5 two)) - (should-equal one (provided-mode-derived-p three one.5 one)) - (should-equal two (provided-mode-derived-p three one.5 one two)) - (should-equal two (provided-mode-derived-p three one.5 two one)) - (should-equal three (provided-mode-derived-p three one.5 two one three)) - (should-equal three (provided-mode-derived-p three one.5 three two one)) + (should (provided-mode-derived-p two one.5 one)) + (should (provided-mode-derived-p two one.5 two)) + (should (provided-mode-derived-p three one.5 one)) + (should (provided-mode-derived-p three one.5 one two)) + (should (provided-mode-derived-p three one.5 two one)) + (should (provided-mode-derived-p three one.5 two one three)) + (should (provided-mode-derived-p three one.5 three two one)) (let ((major-mode three)) - (should-equal one (derived-mode-p one)) - (should-equal one (derived-mode-p one.5 one)) - (should-equal two (derived-mode-p one.5 one two)) - (should-equal two (derived-mode-p one.5 two one)) - (should-equal three (derived-mode-p one.5 two one three)) - (should-equal three (derived-mode-p one.5 three two one))))) + (should (derived-mode-p one)) + (should (derived-mode-p one.5 one)) + (should (derived-mode-p one.5 one two)) + (should (derived-mode-p one.5 two one)) + (should (derived-mode-p one.5 two one three)) + (should (derived-mode-p one.5 three two one))))) (ert-deftest compat-format-prompt () (should-equal "Prompt: " (format-prompt "Prompt" nil)) |