From 42c54edaa924aa0d2740635423c23ec275b28f13 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 27 Jun 2024 11:37:15 +0300 Subject: [PATCH] ; Fix simple-tests as fallout of last change * test/lisp/simple-tests.el (simple-execute-extended-command--shorter): Fix test broken by new kill-whole-line tests. (Bug#65734) (cherry picked from commit f475a1a25449509aa8c081d63f6ca63833cfdd35) --- test/lisp/simple-tests.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el index 9e3e71bd69b..d94fa4a583d 100644 --- a/test/lisp/simple-tests.el +++ b/test/lisp/simple-tests.el @@ -126,7 +126,12 @@ mark there." (should (equal (execute-extended-command--shorter "display-line-numbers-mode" "display-line") - "di-n"))) + ;; Depending on the tests performed and their order, we + ;; could have loaded Dired, which defines commands + ;; starting with "dir". + (if (featurep 'dired) + "dis-n" + "di-n")))) (ert-deftest simple-execute-extended-command--describe-binding-msg () (let ((text-quoting-style 'grave)) @@ -1093,6 +1098,7 @@ See Bug#21722." ;;; Tests for `kill-whole-line' +(declare-function org-fold-hide-sublevels "org-fold" (levels)) (ert-deftest kill-whole-line-invisible () (cl-flet ((test (kill-whole-line-arg &rest expected-lines) (ert-info ((format "%s" kill-whole-line-arg) :prefix "Subtest: ") -- 2.39.2